Anpassungen der Soll/Ist Auswertung für HPH Bersenbrück ATZ, Bugfix Betreuwo, SHK Service VertretungsManager

This commit is contained in:
Christian
2024-03-20 17:32:19 +01:00
parent ecb9da09b6
commit 07121e25b0
17 changed files with 427 additions and 1041 deletions

View File

@@ -1040,20 +1040,3 @@ CREATE TABLE `bargeldtransaktionshistory` (
ALTER TABLE bargeldtransaktion ADD COLUMN SignatureOid BIGINT;
ALTER TABLE `customer`
CHANGE COLUMN `HealthInsurance` `HealthInsurance` VARCHAR(256) NULL DEFAULT NULL ,
CHANGE COLUMN `InsuranceNumber` `InsuranceNumber` VARCHAR(256) NULL DEFAULT NULL ,
CHANGE COLUMN `VersichertenStatus` `VersichertenStatus` VARCHAR(256) NULL DEFAULT NULL ;
ALTER TABLE `organisation`
CHANGE COLUMN `IKKrankenkasse` `IKKrankenkasse` VARCHAR(256) NULL DEFAULT NULL ,
CHANGE COLUMN `IKKostentrager` `IKKostentrager` VARCHAR(256) NULL DEFAULT NULL ,
CHANGE COLUMN `IKDatenannahmestelle` `IKDatenannahmestelle` VARCHAR(256) NULL DEFAULT NULL ;
ALTER TABLE `mandator`
CHANGE COLUMN `IKLeistungserbringer` `IKLeistungserbringer` VARCHAR(256) NULL DEFAULT NULL ;

View File

@@ -196,7 +196,11 @@ namespace BeWo.Report.ReportObjects
}
empDetail.SollProTag = (weeklyTotalHours / empDetail.ArbeitstageProWoche);
empDetail.SollProWoche = BerechneSollProWoche(c, empDetail);
if (empDetail.SollProTag == 0 && empDetail.SollProWoche > 0 && empDetail.ArbeitstageProWoche > 0)
{
empDetail.SollProTag = empDetail.SollProWoche / empDetail.ArbeitstageProWoche;
}
HandleServiceRecords(empDetail, groupFilteredRecords, c);
if (CheckIst)
@@ -706,12 +710,13 @@ namespace BeWo.Report.ReportObjects
if (festeflsSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
return festeflsSollProMonat.Value;
//flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
if (stundenSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum *= (festeflsSollProMonat.Value / stundenSollProMonat.Value);
}
//if (stundenSollProMonat.HasValue)
//{
// flsSollImVertragsUndBerichtzeitraum *= (festeflsSollProMonat.Value / stundenSollProMonat.Value);
//}
}
else
{
@@ -2425,28 +2430,30 @@ namespace BeWo.Report.ReportObjects
{
foreach (var at in emp.AbsenceTimes)
{
if ((!at.Start.HasValue || at.Start.Value <= arbeitstagEnde.Date) && (!at.End.HasValue || at.End.Value >= arbeitstagStart.Date))
if (IstAnrechenbareAbsenceTime(at))
{
var faktor = GetFeiertagsFaktor(arbeitstagStart);
if (faktor < 1)
if ((!at.Start.HasValue || at.Start.Value <= arbeitstagEnde.Date) && (!at.End.HasValue || at.End.Value >= arbeitstagStart.Date))
{
var hours = (decimal)arbeitstagEnde.Subtract(arbeitstagStart).TotalHours;
var faktor = GetFeiertagsFaktor(arbeitstagStart);
// Prüfen, ob halber Tag
if ((at.Start.HasValue && at.Start.Value.Date != at.Start.Value) || (at.End.HasValue && at.End.Value.Date != at.End.Value))
hours /= 2;
if (faktor != 0)
if (faktor < 1)
{
hours *= faktor;
var hours = (decimal)arbeitstagEnde.Subtract(arbeitstagStart).TotalHours;
// Prüfen, ob halber Tag
if ((at.Start.HasValue && at.Start.Value.Date != at.Start.Value) || (at.End.HasValue && at.End.Value.Date != at.End.Value))
hours /= 2;
if (faktor != 0)
{
hours *= faktor;
}
return hours;
}
return hours;
}
}
}
@@ -3383,6 +3390,8 @@ namespace BeWo.Report.ReportObjects
//gibt 1 zurück wenn ganzer Feiertag und z.B. 0.5 bei halben etc.
public virtual decimal GetFeiertagsFaktor(DateTime start)
{
//CB 26.02.2024: Darf nicht über den VacationService gehen, sonst werden die im CustomMitarbeiterstundenkontoBerechnung hinterlegten Feiertage ignoriert
//return vacationService.GetFeiertagsFaktor(start);
if (IstFeiertag(start))
{
return 1;
@@ -3417,7 +3426,6 @@ namespace BeWo.Report.ReportObjects
protected DateTime GetOsterSonntag(int year)
{
return VacationService.GetOsterSonntag(year);
return VacationService.GetOsterSonntag(year);
}
public virtual bool IsServiceRecordFehlzeit(ServiceRecord sr)

View File

@@ -83,7 +83,7 @@ namespace BetreuWoReports
{
if(GetCurrentRow() is MitarbeiterstundenkontoRO reportObject && DetailReport.GetCurrentRow() is MitarbeiterstundenkontoRO.EmployeeDetail employeeDetail)
{
if(IstGfb(reportObject, employeeDetail))
if(!IstGfb(reportObject, employeeDetail))
{
e.Cancel = true;
}

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -70,6 +70,8 @@
<Compile Include="CustomerDataReport.Designer.cs">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
</Compile>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="FLSGroupReport.cs">
<SubType>Component</SubType>
@@ -84,6 +86,12 @@
<Compile Include="FLSListReport.Designer.cs">
<DependentUpon>FLSListReport.cs</DependentUpon>
</Compile>
<Compile Include="ListeTherapieeinheitenSollIstGesamt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ListeTherapieeinheitenSollIstGesamt.Designer.cs">
<DependentUpon>ListeTherapieeinheitenSollIstGesamt.cs</DependentUpon>
</Compile>
<Compile Include="ListeTherapieeinheitenSollIst.cs">
<SubType>Component</SubType>
</Compile>
@@ -96,6 +104,24 @@
<Compile Include="ListeTherapieeinheitenJahr.Designer.cs">
<DependentUpon>ListeTherapieeinheitenJahr.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ListeTherapieeinheitenMonat.cs">
<SubType>Component</SubType>
@@ -132,12 +158,26 @@
<DependentUpon>FLSListReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ListeTherapieeinheitenSollIstGesamt.resx">
<DependentUpon>ListeTherapieeinheitenSollIstGesamt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ListeTherapieeinheitenSollIst.resx">
<DependentUpon>ListeTherapieeinheitenSollIst.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ListeTherapieeinheitenJahr.resx">
<DependentUpon>ListeTherapieeinheitenJahr.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ListeTherapieeinheitenMonat.resx">
<DependentUpon>ListeTherapieeinheitenMonat.cs</DependentUpon>

View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
partial class ListeTherapieeinheitenJahr
{

View File

@@ -14,7 +14,7 @@ using DevExpress.XtraPrinting;
using DevExpress.XtraReports.Native;
using BeWo.Data.Security;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
public partial class ListeTherapieeinheitenJahr : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
@@ -199,7 +199,7 @@ namespace BeWo.HphBersenbrueckAtz
for (int i = 0; i < 12; i++)
{
var mb = new MitarbeiterstundenkontoBerechnung();
var mb = new CustomMitarbeiterstundenkontoBerechnung();
var ro = new MitarbeiterstundenkontoRO();
ro.ReportStartDate = new DateTime(abfrageMonat.Year, i + 1, 1);
@@ -207,6 +207,7 @@ namespace BeWo.HphBersenbrueckAtz
var empDetail = new MitarbeiterstundenkontoRO.EmployeeDetail();
empDetail.Employee = emp;
empDetail.AllServiceRecords = new List<ServiceRecord>(); //verhindert das Laden aller Servicerecords in der Stundenkonto Berechnung
ro.EmployeeDetailList.Add(empDetail);
mb.CreateReport(ro);

View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
partial class ListeTherapieeinheitenMonat
{
@@ -275,8 +275,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
@@ -549,8 +549,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable4
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(97.91666F, 25.52083F);
@@ -584,8 +584,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable5
//
this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -661,8 +661,8 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell114
//
this.xrTableCell114.BackColor = System.Drawing.Color.Transparent;
this.xrTableCell114.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell114.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell114.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell114.Multiline = true;
@@ -676,8 +676,8 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell116
//
this.xrTableCell116.BackColor = System.Drawing.Color.Transparent;
this.xrTableCell116.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell116.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell116.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell116.Name = "xrTableCell116";
@@ -1030,8 +1030,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable7
//
this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(351.0417F, 0F);
@@ -1100,8 +1100,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable15
//
this.xrTable15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable15.Font = new System.Drawing.Font("Arial", 9F);
this.xrTable15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
@@ -1156,7 +1156,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell75
//
this.xrTableCell75.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell75.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell75.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell75.Name = "xrTableCell75";
@@ -1172,7 +1172,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell77
//
this.xrTableCell77.BackColor = System.Drawing.Color.LightGreen;
this.xrTableCell77.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell77.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell77.Name = "xrTableCell77";
this.xrTableCell77.StylePriority.UseBackColor = false;
@@ -1181,7 +1181,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell117
//
this.xrTableCell117.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell117.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell117.Name = "xrTableCell117";
this.xrTableCell117.StylePriority.UseBorders = false;
@@ -1189,7 +1189,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell115
//
this.xrTableCell115.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell115.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell115.Name = "xrTableCell115";
this.xrTableCell115.StylePriority.UseBorders = false;
@@ -1197,7 +1197,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell118
//
this.xrTableCell118.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell118.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell118.Name = "xrTableCell118";
this.xrTableCell118.StylePriority.UseBorders = false;
@@ -1205,7 +1205,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell113
//
this.xrTableCell113.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell113.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell113.Name = "xrTableCell113";
this.xrTableCell113.StylePriority.UseBorders = false;
@@ -1213,7 +1213,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell119
//
this.xrTableCell119.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell119.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell119.Name = "xrTableCell119";
this.xrTableCell119.StylePriority.UseBorders = false;
@@ -1221,7 +1221,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell120
//
this.xrTableCell120.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell120.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell120.Name = "xrTableCell120";
this.xrTableCell120.StylePriority.UseBorders = false;
@@ -1230,7 +1230,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell121
//
this.xrTableCell121.BackColor = System.Drawing.Color.LightGreen;
this.xrTableCell121.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell121.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell121.Name = "xrTableCell121";
this.xrTableCell121.StylePriority.UseBackColor = false;
@@ -1239,7 +1239,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell111
//
this.xrTableCell111.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell111.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell111.Name = "xrTableCell111";
this.xrTableCell111.StylePriority.UseBorders = false;
@@ -1247,7 +1247,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell124
//
this.xrTableCell124.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell124.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell124.Name = "xrTableCell124";
this.xrTableCell124.StylePriority.UseBorders = false;
@@ -1255,7 +1255,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell123
//
this.xrTableCell123.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell123.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell123.Name = "xrTableCell123";
this.xrTableCell123.StylePriority.UseBorders = false;
@@ -1263,7 +1263,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell125
//
this.xrTableCell125.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell125.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell125.Name = "xrTableCell125";
this.xrTableCell125.StylePriority.UseBorders = false;
@@ -1271,7 +1271,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell122
//
this.xrTableCell122.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell122.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell122.Name = "xrTableCell122";
this.xrTableCell122.StylePriority.UseBorders = false;
@@ -1279,7 +1279,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell126
//
this.xrTableCell126.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell126.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell126.Name = "xrTableCell126";
this.xrTableCell126.StylePriority.UseBorders = false;
@@ -1288,7 +1288,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell127
//
this.xrTableCell127.BackColor = System.Drawing.Color.LightGreen;
this.xrTableCell127.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell127.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell127.Name = "xrTableCell127";
this.xrTableCell127.StylePriority.UseBackColor = false;
@@ -1297,7 +1297,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell110
//
this.xrTableCell110.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell110.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell110.Name = "xrTableCell110";
this.xrTableCell110.StylePriority.UseBorders = false;
@@ -1305,7 +1305,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell130
//
this.xrTableCell130.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell130.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell130.Name = "xrTableCell130";
this.xrTableCell130.StylePriority.UseBorders = false;
@@ -1313,7 +1313,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell129
//
this.xrTableCell129.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell129.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell129.Name = "xrTableCell129";
this.xrTableCell129.StylePriority.UseBorders = false;
@@ -1321,7 +1321,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell132
//
this.xrTableCell132.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell132.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell132.Name = "xrTableCell132";
this.xrTableCell132.StylePriority.UseBorders = false;
@@ -1329,7 +1329,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell131
//
this.xrTableCell131.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell131.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell131.Name = "xrTableCell131";
this.xrTableCell131.StylePriority.UseBorders = false;
@@ -1337,7 +1337,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell128
//
this.xrTableCell128.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell128.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell128.Name = "xrTableCell128";
this.xrTableCell128.StylePriority.UseBorders = false;
@@ -1346,7 +1346,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell135
//
this.xrTableCell135.BackColor = System.Drawing.Color.LightGreen;
this.xrTableCell135.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell135.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell135.Name = "xrTableCell135";
this.xrTableCell135.StylePriority.UseBackColor = false;
@@ -1355,7 +1355,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell134
//
this.xrTableCell134.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell134.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell134.Name = "xrTableCell134";
this.xrTableCell134.StylePriority.UseBorders = false;
@@ -1363,7 +1363,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell133
//
this.xrTableCell133.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell133.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell133.Name = "xrTableCell133";
this.xrTableCell133.StylePriority.UseBorders = false;
@@ -1371,7 +1371,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell136
//
this.xrTableCell136.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell136.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell136.Name = "xrTableCell136";
this.xrTableCell136.StylePriority.UseBorders = false;
@@ -1379,7 +1379,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell139
//
this.xrTableCell139.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell139.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell139.Name = "xrTableCell139";
this.xrTableCell139.StylePriority.UseBorders = false;
@@ -1387,7 +1387,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell138
//
this.xrTableCell138.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell138.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell138.Name = "xrTableCell138";
this.xrTableCell138.StylePriority.UseBorders = false;
@@ -1395,7 +1395,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell137
//
this.xrTableCell137.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell137.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell137.Name = "xrTableCell137";
this.xrTableCell137.StylePriority.UseBorders = false;
@@ -1404,7 +1404,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell140
//
this.xrTableCell140.BackColor = System.Drawing.Color.LightGreen;
this.xrTableCell140.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell140.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell140.Name = "xrTableCell140";
this.xrTableCell140.StylePriority.UseBackColor = false;
@@ -1413,7 +1413,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell141
//
this.xrTableCell141.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell141.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell141.Name = "xrTableCell141";
this.xrTableCell141.StylePriority.UseBorders = false;
@@ -1421,7 +1421,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell142
//
this.xrTableCell142.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell142.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell142.Name = "xrTableCell142";
this.xrTableCell142.StylePriority.UseBorders = false;
@@ -1438,8 +1438,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable14
//
this.xrTable14.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable14.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable14.Font = new System.Drawing.Font("Arial", 9F);
this.xrTable14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -1495,8 +1495,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell74
//
this.xrTableCell74.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell74.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell74.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell74.Name = "xrTableCell74";
@@ -1693,8 +1693,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable13
//
this.xrTable13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable13.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable13.LocationFloat = new DevExpress.Utils.PointFloat(246.0417F, 200F);
@@ -1717,7 +1717,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell61
//
this.xrTableCell61.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.xrTableCell61.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell61.Name = "xrTableCell61";
this.xrTableCell61.StylePriority.UseBorders = false;
@@ -1728,7 +1728,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// cellSollArbeitstag
//
this.cellSollArbeitstag.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
this.cellSollArbeitstag.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.cellSollArbeitstag.Name = "cellSollArbeitstag";
this.cellSollArbeitstag.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 30, 3, 3, 100F);
@@ -1740,7 +1740,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable12
//
this.xrTable12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable12.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable12.LocationFloat = new DevExpress.Utils.PointFloat(874.0545F, 200F);
@@ -1808,7 +1808,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTable11
//
this.xrTable11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.xrTable11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTable11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable11.LocationFloat = new DevExpress.Utils.PointFloat(874.0545F, 85.41666F);

View File

@@ -14,7 +14,7 @@ using DevExpress.XtraPrinting;
using DevExpress.XtraReports.Native;
using BeWo.Data.Security;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
public partial class ListeTherapieeinheitenMonat : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
@@ -320,7 +320,7 @@ namespace BeWo.HphBersenbrueckAtz
private void CreateEmployeeData(Employee emp, DateTime abfrageMonat)
{
var mb = new MitarbeiterstundenkontoBerechnung();
var mb = new CustomMitarbeiterstundenkontoBerechnung();
var ro = new MitarbeiterstundenkontoRO();
ro.ReportStartDate = abfrageMonat;

View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
partial class ListeTherapieeinheitenSollIst
{
@@ -37,6 +37,7 @@ namespace BeWo.HphBersenbrueckAtz
DevExpress.XtraCharts.PieSeriesView pieSeriesView2 = new DevExpress.XtraCharts.PieSeriesView();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ListeTherapieeinheitenSollIst));
this.xrChart1 = new DevExpress.XtraReports.UI.XRChart();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -102,7 +103,7 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.tblRowSoll = new DevExpress.XtraReports.UI.XRTableRow();
this.tblRowSollBSB = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -116,7 +117,20 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.tblRowSollDH = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell92 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell93 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell94 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell95 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell96 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell97 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell98 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell99 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell100 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell101 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell102 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell103 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell104 = new DevExpress.XtraReports.UI.XRTableCell();
this.tblRowSollGesamt = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -159,19 +173,19 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell89 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell90 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell91 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
((System.ComponentModel.ISupportInitialize)(this.xrChart1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(series1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesLabel1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesLabel2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tblMonate)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// xrChart1
@@ -180,6 +194,7 @@ namespace BeWo.HphBersenbrueckAtz
this.xrChart1.BorderColor = System.Drawing.Color.Black;
this.xrChart1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrChart1.DataSource = this.bindingSource1;
this.xrChart1.Legend.LegendID = -1;
this.xrChart1.Legend.Name = "Default Legend";
this.xrChart1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
this.xrChart1.LocationFloat = new DevExpress.Utils.PointFloat(172.8611F, 0F);
@@ -192,13 +207,14 @@ namespace BeWo.HphBersenbrueckAtz
series1.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.Qualitative;
pieSeriesLabel1.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
pieSeriesLabel1.ColumnIndent = 1;
pieSeriesLabel1.Font = new System.Drawing.Font("Arial", 10F);
pieSeriesLabel1.DXFont = new DevExpress.Drawing.DXFont("Arial", 10F);
pieSeriesLabel1.LineLength = 1;
pieSeriesLabel1.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
pieSeriesLabel1.Position = DevExpress.XtraCharts.PieSeriesLabelPosition.Inside;
pieSeriesLabel1.TextPattern = "{A}: {V:0.00} ({VP:0.00}%)";
series1.Label = pieSeriesLabel1;
series1.Name = "Anzahl";
series1.SeriesID = 0;
series1.TopNOptions.Count = 7;
series1.TopNOptions.Enabled = true;
series1.ValueDataMembersSerializable = "Anzahl";
@@ -214,6 +230,10 @@ namespace BeWo.HphBersenbrueckAtz
this.xrChart1.SizeF = new System.Drawing.SizeF(691.4447F, 343.3333F);
this.xrChart1.CustomDrawSeriesPoint += new DevExpress.XtraCharts.CustomDrawSeriesPointEventHandler(this.xrChart1_CustomDrawSeriesPoint);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
//
// Detail
//
this.Detail.HeightF = 0F;
@@ -233,8 +253,8 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(917.1667F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(120.0001F, 79.06249F);
@@ -242,7 +262,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTable6
//
this.xrTable6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTable6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.41667F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
@@ -263,7 +283,7 @@ namespace BeWo.HphBersenbrueckAtz
// cellMitarbeiterIn
//
this.cellMitarbeiterIn.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellMitarbeiterIn.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.cellMitarbeiterIn.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.cellMitarbeiterIn.Name = "cellMitarbeiterIn";
this.cellMitarbeiterIn.StylePriority.UseBorders = false;
this.cellMitarbeiterIn.StylePriority.UseFont = false;
@@ -277,7 +297,7 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(636.3334F, 0F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
@@ -300,7 +320,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTableCell223
//
this.xrTableCell223.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell223.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrTableCell223.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell223.Name = "xrTableCell223";
this.xrTableCell223.StylePriority.UseBorders = false;
this.xrTableCell223.StylePriority.UseFont = false;
@@ -312,7 +332,7 @@ namespace BeWo.HphBersenbrueckAtz
// xrTable2
//
this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
@@ -333,7 +353,7 @@ namespace BeWo.HphBersenbrueckAtz
// cellUeberschrift
//
this.cellUeberschrift.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.cellUeberschrift.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.cellUeberschrift.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.cellUeberschrift.Name = "cellUeberschrift";
this.cellUeberschrift.StylePriority.UseBorders = false;
this.cellUeberschrift.StylePriority.UseFont = false;
@@ -348,7 +368,7 @@ namespace BeWo.HphBersenbrueckAtz
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -358,7 +378,7 @@ namespace BeWo.HphBersenbrueckAtz
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -368,7 +388,7 @@ namespace BeWo.HphBersenbrueckAtz
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -378,7 +398,7 @@ namespace BeWo.HphBersenbrueckAtz
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -412,7 +432,7 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
@@ -533,8 +553,8 @@ namespace BeWo.HphBersenbrueckAtz
//
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.tblMonate});
this.GroupHeader3.Font = new System.Drawing.Font("Arial", 9F);
this.GroupHeader3.HeightF = 138F;
this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.GroupHeader3.HeightF = 161F;
this.GroupHeader3.Name = "GroupHeader3";
this.GroupHeader3.StylePriority.UseFont = false;
//
@@ -543,18 +563,19 @@ namespace BeWo.HphBersenbrueckAtz
this.tblMonate.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.tblMonate.Font = new System.Drawing.Font("Arial", 10F);
this.tblMonate.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.tblMonate.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.tblMonate.Name = "tblMonate";
this.tblMonate.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.tblMonate.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.tblRowIst,
this.tblRowIstGesamt,
this.tblRowSoll,
this.tblRowSollBSB,
this.tblRowSollDH,
this.tblRowSollGesamt,
this.tblRowDiff,
this.tblRowDiffGesamt});
this.tblMonate.SizeF = new System.Drawing.SizeF(1029.965F, 138F);
this.tblMonate.SizeF = new System.Drawing.SizeF(1029.965F, 161F);
this.tblMonate.StylePriority.UseBorders = false;
this.tblMonate.StylePriority.UseFont = false;
this.tblMonate.StylePriority.UsePadding = false;
@@ -583,7 +604,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell50
//
this.xrTableCell50.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseFont = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
@@ -672,14 +693,14 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell34,
this.xrTableCell35,
this.xrTableCell36});
this.tblRowIstGesamt.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.tblRowIstGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.tblRowIstGesamt.Name = "tblRowIstGesamt";
this.tblRowIstGesamt.StylePriority.UseFont = false;
this.tblRowIstGesamt.Weight = 0.80290918001034051D;
//
// xrTableCell51
//
this.xrTableCell51.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell51.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.StylePriority.UseFont = false;
this.xrTableCell51.StylePriority.UseTextAlignment = false;
@@ -760,9 +781,9 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell36.Text = "xrTableCell36";
this.xrTableCell36.Weight = 0.2473014298120183D;
//
// tblRowSoll
// tblRowSollBSB
//
this.tblRowSoll.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.tblRowSollBSB.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell52,
this.xrTableCell37,
this.xrTableCell38,
@@ -776,16 +797,16 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell46,
this.xrTableCell47,
this.xrTableCell48});
this.tblRowSoll.Name = "tblRowSoll";
this.tblRowSoll.Weight = 0.80290918001034051D;
this.tblRowSollBSB.Name = "tblRowSollBSB";
this.tblRowSollBSB.Weight = 0.80290918001034051D;
//
// xrTableCell52
//
this.xrTableCell52.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell52.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell52.Name = "xrTableCell52";
this.xrTableCell52.StylePriority.UseFont = false;
this.xrTableCell52.StylePriority.UseTextAlignment = false;
this.xrTableCell52.Text = "Soll";
this.xrTableCell52.Text = "Soll BSB";
this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
this.xrTableCell52.Weight = 0.24730142981201836D;
//
@@ -862,13 +883,121 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell48.Text = "xrTableCell48";
this.xrTableCell48.Weight = 0.2473014298120183D;
//
// GroupHeader1
// tblRowSollDH
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrChart1});
this.GroupHeader1.HeightF = 343.3333F;
this.GroupHeader1.Level = 2;
this.GroupHeader1.Name = "GroupHeader1";
this.tblRowSollDH.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell92,
this.xrTableCell93,
this.xrTableCell94,
this.xrTableCell95,
this.xrTableCell96,
this.xrTableCell97,
this.xrTableCell98,
this.xrTableCell99,
this.xrTableCell100,
this.xrTableCell101,
this.xrTableCell102,
this.xrTableCell103,
this.xrTableCell104});
this.tblRowSollDH.Name = "tblRowSollDH";
this.tblRowSollDH.Weight = 0.80290918001034051D;
//
// xrTableCell92
//
this.xrTableCell92.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell92.Multiline = true;
this.xrTableCell92.Name = "xrTableCell92";
this.xrTableCell92.StylePriority.UseFont = false;
this.xrTableCell92.StylePriority.UseTextAlignment = false;
this.xrTableCell92.Text = "Soll DH";
this.xrTableCell92.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
this.xrTableCell92.Weight = 0.24730142981201836D;
//
// xrTableCell93
//
this.xrTableCell93.Multiline = true;
this.xrTableCell93.Name = "xrTableCell93";
this.xrTableCell93.StylePriority.UseTextAlignment = false;
this.xrTableCell93.Text = "xrTableCell93";
this.xrTableCell93.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
this.xrTableCell93.Weight = 0.24730142981201836D;
//
// xrTableCell94
//
this.xrTableCell94.Multiline = true;
this.xrTableCell94.Name = "xrTableCell94";
this.xrTableCell94.Text = "xrTableCell94";
this.xrTableCell94.Weight = 0.24730142981201819D;
//
// xrTableCell95
//
this.xrTableCell95.Multiline = true;
this.xrTableCell95.Name = "xrTableCell95";
this.xrTableCell95.Text = "xrTableCell95";
this.xrTableCell95.Weight = 0.24730142981201816D;
//
// xrTableCell96
//
this.xrTableCell96.Multiline = true;
this.xrTableCell96.Name = "xrTableCell96";
this.xrTableCell96.Text = "xrTableCell96";
this.xrTableCell96.Weight = 0.24730142981201816D;
//
// xrTableCell97
//
this.xrTableCell97.Multiline = true;
this.xrTableCell97.Name = "xrTableCell97";
this.xrTableCell97.Text = "xrTableCell97";
this.xrTableCell97.Weight = 0.24730142981201814D;
//
// xrTableCell98
//
this.xrTableCell98.Multiline = true;
this.xrTableCell98.Name = "xrTableCell98";
this.xrTableCell98.Text = "xrTableCell98";
this.xrTableCell98.Weight = 0.2473014298120183D;
//
// xrTableCell99
//
this.xrTableCell99.Multiline = true;
this.xrTableCell99.Name = "xrTableCell99";
this.xrTableCell99.Text = "xrTableCell99";
this.xrTableCell99.Weight = 0.24730142981201836D;
//
// xrTableCell100
//
this.xrTableCell100.Multiline = true;
this.xrTableCell100.Name = "xrTableCell100";
this.xrTableCell100.Text = "xrTableCell100";
this.xrTableCell100.Weight = 0.24730142981201836D;
//
// xrTableCell101
//
this.xrTableCell101.Multiline = true;
this.xrTableCell101.Name = "xrTableCell101";
this.xrTableCell101.Text = "xrTableCell101";
this.xrTableCell101.Weight = 0.2473014298120183D;
//
// xrTableCell102
//
this.xrTableCell102.Multiline = true;
this.xrTableCell102.Name = "xrTableCell102";
this.xrTableCell102.Text = "xrTableCell102";
this.xrTableCell102.Weight = 0.24730142981201841D;
//
// xrTableCell103
//
this.xrTableCell103.Multiline = true;
this.xrTableCell103.Name = "xrTableCell103";
this.xrTableCell103.Text = "xrTableCell103";
this.xrTableCell103.Weight = 0.24730142981201825D;
//
// xrTableCell104
//
this.xrTableCell104.Multiline = true;
this.xrTableCell104.Name = "xrTableCell104";
this.xrTableCell104.Text = "xrTableCell104";
this.xrTableCell104.Weight = 0.2473014298120183D;
//
// tblRowSollGesamt
//
@@ -886,14 +1015,14 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell63,
this.xrTableCell64,
this.xrTableCell65});
this.tblRowSollGesamt.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.tblRowSollGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.tblRowSollGesamt.Name = "tblRowSollGesamt";
this.tblRowSollGesamt.StylePriority.UseFont = false;
this.tblRowSollGesamt.Weight = 0.80290918001034051D;
//
// xrTableCell53
//
this.xrTableCell53.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell53.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell53.Name = "xrTableCell53";
this.xrTableCell53.StylePriority.UseFont = false;
this.xrTableCell53.StylePriority.UseTextAlignment = false;
@@ -996,7 +1125,7 @@ namespace BeWo.HphBersenbrueckAtz
//
// xrTableCell66
//
this.xrTableCell66.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell66.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell66.Name = "xrTableCell66";
this.xrTableCell66.StylePriority.UseFont = false;
this.xrTableCell66.StylePriority.UseTextAlignment = false;
@@ -1094,14 +1223,14 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell89,
this.xrTableCell90,
this.xrTableCell91});
this.tblRowDiffGesamt.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.tblRowDiffGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.tblRowDiffGesamt.Name = "tblRowDiffGesamt";
this.tblRowDiffGesamt.StylePriority.UseFont = false;
this.tblRowDiffGesamt.Weight = 0.80290918001034051D;
//
// xrTableCell79
//
this.xrTableCell79.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell79.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell79.Name = "xrTableCell79";
this.xrTableCell79.StylePriority.UseFont = false;
this.xrTableCell79.StylePriority.UseTextAlignment = false;
@@ -1183,9 +1312,13 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell91.Text = "xrTableCell91";
this.xrTableCell91.Weight = 0.2473014298120183D;
//
// bindingSource1
// GroupHeader1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrChart1});
this.GroupHeader1.HeightF = 343.3333F;
this.GroupHeader1.Level = 2;
this.GroupHeader1.Name = "GroupHeader1";
//
// ListeTherapieeinheitenSollIst
//
@@ -1201,7 +1334,7 @@ namespace BeWo.HphBersenbrueckAtz
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 50);
this.Margins = new DevExpress.Drawing.DXMargins(50F, 50F, 50F, 50F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1210,19 +1343,19 @@ namespace BeWo.HphBersenbrueckAtz
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(pieSeriesLabel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(series1)).EndInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesLabel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(pieSeriesView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrChart1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tblMonate)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1292,7 +1425,7 @@ namespace BeWo.HphBersenbrueckAtz
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTableRow tblRowSoll;
private DevExpress.XtraReports.UI.XRTableRow tblRowSollBSB;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
@@ -1353,5 +1486,19 @@ namespace BeWo.HphBersenbrueckAtz
private DevExpress.XtraReports.UI.XRTableCell xrTableCell89;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell90;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell91;
private DevExpress.XtraReports.UI.XRTableRow tblRowSollDH;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell92;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell93;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell94;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell95;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell96;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell97;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell98;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell99;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell100;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell101;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell102;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell103;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell104;
}
}

View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.Native;
using DevExpress.XtraCharts;
using BeWo.Data.Security;
namespace BeWo.HphBersenbrueckAtz
namespace HphBersenbrueckAtz
{
public partial class ListeTherapieeinheitenSollIst : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
@@ -88,7 +88,7 @@ namespace BeWo.HphBersenbrueckAtz
CreateTabelle(emp, abfrageMonat);
cellMitarbeiterIn.Text = String.Format("Mitarbeiter/in: {0}", emp.Person.FirstNameLastName);
cellUeberschrift.Text = String.Format("Therapieeinheiten Soll/Ist Stand {0:MMMM yyyy}", abfrageMonat);
cellUeberschrift.Text = String.Format("Therapieeinheiten Soll/Ist {0:yyyy}", abfrageMonat);
}
}
@@ -125,11 +125,9 @@ namespace BeWo.HphBersenbrueckAtz
private void InsertSollDaten(Employee emp, DateTime abfrageMonat, TherapieEinheitenSollIst daten)
{
decimal summe = 0;
for (int i = 0; i < 12; i++)
{
var mb = new MitarbeiterstundenkontoBerechnung();
var mb = new CustomMitarbeiterstundenkontoBerechnung();
var ro = new MitarbeiterstundenkontoRO();
ro.ReportStartDate = new DateTime(abfrageMonat.Year, i + 1, 1);
@@ -137,10 +135,13 @@ namespace BeWo.HphBersenbrueckAtz
var empDetail = new MitarbeiterstundenkontoRO.EmployeeDetail();
empDetail.Employee = emp;
empDetail.AllServiceRecords = new List<ServiceRecord>(); //verhindert das Laden aller Servicerecords in der Stundenkonto Berechnung
ro.EmployeeDetailList.Add(empDetail);
mb.CreateReport(ro);
daten.SollBSBProMonat[i] = empDetail.Custom1 * 60;
daten.SollDHProMonat[i] = empDetail.Custom2 * 60;
daten.SollProMonat[i] = empDetail.FlsSoll * 60;
@@ -192,12 +193,23 @@ namespace BeWo.HphBersenbrueckAtz
tblRowIst.Cells[i + 1].Text = String.Format("{0:0.0#}", daten.IstProMonat[i] / 60);
tblRowIstGesamt.Cells[i + 1].Text = String.Format("{0:0.0#}", summeIst / 60);
tblRowSoll.Cells[i + 1].Text = String.Format("{0:0.0#}", daten.SollProMonat[i] / 60);
tblRowSollBSB.Cells[i + 1].Text = String.Format("{0:0.0#}", daten.SollBSBProMonat[i] / 60);
tblRowSollDH.Cells[i + 1].Text = String.Format("{0:0.0#}", daten.SollDHProMonat[i] / 60);
tblRowSollGesamt.Cells[i + 1].Text = String.Format("{0:0.0#}", summeSoll / 60);
tblRowDiff.Cells[i + 1].Text = String.Format("{0:0.0#}", (daten.IstProMonat[i] - daten.SollProMonat[i]) / 60);
tblRowDiffGesamt.Cells[i + 1].Text = String.Format("{0:0.0#}", (summeIst - summeSoll) / 60);
var diff = (summeIst - summeSoll) / 60;
tblRowDiffGesamt.Cells[i + 1].Text = String.Format("{0:0.0#}", diff);
if (diff >= 0)
{
tblRowDiffGesamt.Cells[i + 1].ForeColor = Color.Green;
}
else
{
tblRowDiffGesamt.Cells[i + 1].ForeColor = Color.Red;
}
}
}
@@ -239,9 +251,15 @@ namespace BeWo.HphBersenbrueckAtz
{
public TherapieEinheitenSollIst()
{
SollBSBProMonat = new decimal[12];
SollDHProMonat = new decimal[12];
SollProMonat = new decimal[12];
IstProMonat = new decimal[12];
}
public decimal[] SollBSBProMonat { get; set; }
public decimal[] SollDHProMonat { get; set; }
public decimal[] SollProMonat { get; set; }
public decimal[] IstProMonat { get; set; }

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -55,6 +55,7 @@ namespace TeamPfeil
this.xrTableCell_Service = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell_HZEmployee = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell_HZClient = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -80,11 +81,10 @@ namespace TeamPfeil
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldMinuten12 = new DevExpress.XtraReports.UI.CalculatedField();
this.TotalFLMBillableAsHours = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -121,7 +121,7 @@ namespace TeamPfeil
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.4999903F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -149,7 +149,7 @@ namespace TeamPfeil
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")});
this.xrTableCell13.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 2, 0, 100F);
this.xrTableCell13.StylePriority.UseBorders = false;
@@ -164,7 +164,7 @@ namespace TeamPfeil
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString", "{0:HH:mm}")});
this.xrTableCell14.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 2, 0, 100F);
this.xrTableCell14.StylePriority.UseBorders = false;
@@ -179,7 +179,7 @@ namespace TeamPfeil
//
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes")});
this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 2, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
@@ -193,7 +193,7 @@ namespace TeamPfeil
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")});
this.xrTableCell2.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 2, 0, 100F);
@@ -207,7 +207,7 @@ namespace TeamPfeil
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
this.xrTableCell15.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.StylePriority.UseFont = false;
@@ -218,7 +218,7 @@ namespace TeamPfeil
//
// xrTableCell12
//
this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
@@ -237,7 +237,7 @@ namespace TeamPfeil
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.4999903F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -260,7 +260,7 @@ namespace TeamPfeil
this.xrTableCell_Month.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Month.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Month.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Month.Name = "xrTableCell_Month";
this.xrTableCell_Month.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Month.StylePriority.UseBorders = false;
@@ -274,7 +274,7 @@ namespace TeamPfeil
this.xrTableCell_Year.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Year.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Year.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Year.Name = "xrTableCell_Year";
this.xrTableCell_Year.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Year.StylePriority.UseBorders = false;
@@ -288,7 +288,7 @@ namespace TeamPfeil
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseBorders = false;
@@ -313,7 +313,7 @@ namespace TeamPfeil
//
this.xrTableCell_Date.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Date.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Date.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Date.Name = "xrTableCell_Date";
this.xrTableCell_Date.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Date.StylePriority.UseBorders = false;
@@ -326,7 +326,7 @@ namespace TeamPfeil
//
this.xrTableCell_Time.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Time.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Time.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Time.Name = "xrTableCell_Time";
this.xrTableCell_Time.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Time.StylePriority.UseBorders = false;
@@ -339,7 +339,7 @@ namespace TeamPfeil
//
this.xrTableCell_Minutes.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Minutes.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Minutes.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Minutes.Name = "xrTableCell_Minutes";
this.xrTableCell_Minutes.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Minutes.StylePriority.UseBorders = false;
@@ -352,7 +352,7 @@ namespace TeamPfeil
//
this.xrTableCell_Service.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_Service.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_Service.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_Service.Name = "xrTableCell_Service";
this.xrTableCell_Service.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_Service.StylePriority.UseBorders = false;
@@ -365,7 +365,7 @@ namespace TeamPfeil
//
this.xrTableCell_HZEmployee.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_HZEmployee.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_HZEmployee.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_HZEmployee.Name = "xrTableCell_HZEmployee";
this.xrTableCell_HZEmployee.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_HZEmployee.StylePriority.UseBorders = false;
@@ -378,7 +378,7 @@ namespace TeamPfeil
//
this.xrTableCell_HZClient.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell_HZClient.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell_HZClient.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell_HZClient.Name = "xrTableCell_HZClient";
this.xrTableCell_HZClient.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell_HZClient.StylePriority.UseBorders = false;
@@ -387,6 +387,10 @@ namespace TeamPfeil
this.xrTableCell_HZClient.Text = "HZ Klient*in";
this.xrTableCell_HZClient.Weight = 0.27594815745647805D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -410,7 +414,7 @@ namespace TeamPfeil
//
// 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(937.8451F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(144.491F, 110.5509F);
@@ -418,7 +422,7 @@ namespace TeamPfeil
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.5509F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
@@ -436,7 +440,7 @@ namespace TeamPfeil
this.xrLabel_Employee.BorderWidth = 1F;
this.xrLabel_Employee.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel_Employee.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel_Employee.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel_Employee.LocationFloat = new DevExpress.Utils.PointFloat(189.7502F, 160.8617F);
this.xrLabel_Employee.Name = "xrLabel_Employee";
this.xrLabel_Employee.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -450,7 +454,7 @@ namespace TeamPfeil
//
this.xrLabel_WeeklyFLS.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel_WeeklyFLS.BorderWidth = 1F;
this.xrLabel_WeeklyFLS.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel_WeeklyFLS.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel_WeeklyFLS.LocationFloat = new DevExpress.Utils.PointFloat(725.8118F, 122.5042F);
this.xrLabel_WeeklyFLS.Name = "xrLabel_WeeklyFLS";
this.xrLabel_WeeklyFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -464,7 +468,7 @@ namespace TeamPfeil
//
// xrLabel22
//
this.xrLabel22.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0.5001704F, 160.8617F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -474,7 +478,7 @@ namespace TeamPfeil
//
// xrLabel21
//
this.xrLabel21.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(514.9921F, 122.5041F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -484,7 +488,7 @@ namespace TeamPfeil
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.5001704F, 122.5509F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -496,7 +500,7 @@ namespace TeamPfeil
//
this.xrLabel_ClientName.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel_ClientName.BorderWidth = 1F;
this.xrLabel_ClientName.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel_ClientName.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel_ClientName.LocationFloat = new DevExpress.Utils.PointFloat(73.98504F, 122.5509F);
this.xrLabel_ClientName.Name = "xrLabel_ClientName";
this.xrLabel_ClientName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -552,7 +556,7 @@ namespace TeamPfeil
this.xrTable2.BorderColor = System.Drawing.Color.Black;
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new System.Drawing.Font("Calibri", 10F);
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.5001757F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -575,7 +579,7 @@ namespace TeamPfeil
// xrTableCell3
//
this.xrTableCell3.BackColor = System.Drawing.Color.LightGray;
this.xrTableCell3.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 7, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBackColor = false;
@@ -591,7 +595,7 @@ namespace TeamPfeil
//
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillableAsHours")});
this.xrTableCell5.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(7, 0, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseFont = false;
@@ -603,7 +607,7 @@ namespace TeamPfeil
// lblUnterschriftKlient
//
this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlient.Font = new System.Drawing.Font("Calibri", 12F);
this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(0F, 86.62671F);
this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -619,7 +623,7 @@ namespace TeamPfeil
// lblUnterschriftMitarbeiter
//
this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Calibri", 12F);
this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(275.3652F, 86.62671F);
this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -652,10 +656,6 @@ namespace TeamPfeil
this.TotalFLMBillableAsHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.TotalFLMBillableAsHours.Name = "TotalFLMBillableAsHours";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -670,21 +670,22 @@ namespace TeamPfeil
this.fieldMinuten12,
this.TotalFLMBillableAsHours});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F);
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(50, 30, 50, 30);
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4Rotated;
this.Version = "17.1";
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

File diff suppressed because one or more lines are too long

View File

@@ -14,11 +14,14 @@ namespace BeWo.Service.Plugins
return ImportLvrAvise(filename, daten);
#endif
return new UploadImportFileResult
{
Success = false,
ResultMessage = "Die Daten konnten nicht importiert werden."
};
//LVR ist erstmal Standard
return ImportLvrAvise(filename, daten);
//return new UploadImportFileResult
//{
// Success = false,
// ResultMessage = "Die Daten konnten nicht importiert werden."
//};
}

View File

@@ -133,21 +133,25 @@ namespace BeWo.Service.SBD
}
// Vertretungen deren Klient wiederrum vertreten werden muss
foreach (var vertretung in vertretungen)
if (start.Date == end.Date) // Nur in Tagesansicht erst mal
{
if (vertretung.VertretenderMitarbeiterOid.HasValue)
// Vertretungen deren Klient wiederrum vertreten werden muss
foreach (var vertretung in vertretungen)
{
if (employeeAbsenceTimes.Count(ea => ea.EmployeeOid.HasValue && ea.EmployeeOid.Value == vertretung.VertretenderMitarbeiterOid.Value) == 0)
if (vertretung.VertretenderMitarbeiterOid.HasValue)
{
var employee = DAOFactory.GenericDAO.LoadByID<Employee>(vertretung.VertretenderMitarbeiterOid.Value);
if (employeeAbsenceTimes.Count(ea => ea.EmployeeOid.HasValue && ea.EmployeeOid.Value == vertretung.VertretenderMitarbeiterOid.Value) == 0)
{
var employee = DAOFactory.GenericDAO.LoadByID<Employee>(vertretung.VertretenderMitarbeiterOid.Value);
List<VertretungsItemDC> items = CreateVertretungsItemsForAbsenceEmployee(employee, vertretungen, null, start, end);
employeeVertretungsItems.AddRange(items);
List<VertretungsItemDC> items = CreateVertretungsItemsForAbsenceEmployee(employee, vertretungen, null, start, end);
employeeVertretungsItems.AddRange(items);
}
}
}
}
// Klientenabwesenheiten
@@ -544,6 +548,10 @@ namespace BeWo.Service.SBD
SetMailInfos(newVertretungsItem, customer, employee, vertreter, schule);
SetTeamleitung(employee, newVertretungsItem);
if (newVertretungsItem.Absencetime == null)
{
newVertretungsItem.Absencetime = new AbsenceTimeDC();
}
result.Add(newVertretungsItem);
}
}