CB neue Reports

This commit is contained in:
Christian
2018-06-26 17:18:59 +02:00
parent a9a0b46368
commit 48c19361e2
33 changed files with 2548 additions and 1899 deletions

View File

@@ -43,12 +43,12 @@
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.156</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.157</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>157</ApplicationRevision>
<ApplicationRevision>158</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -2099,362 +2099,362 @@
<ItemGroup>
<PublishFile Include="Blacklight.Wpf.Controls">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Charts.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1.Linq">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Office.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.PivotGrid.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Printing.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Sparkline.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Utils.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Charts.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Core.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Docking.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Layout.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Mvvm.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Ribbon.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Scheduler.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraBars.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraCharts.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraEditors.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraNavBar.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPivotGrid.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPrinting.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraReports.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Reporting">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraTreeList.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
</ItemGroup>

View File

@@ -2311,13 +2311,22 @@ namespace BeWoPlanerMobil.Controllers
public void SetServiceRecordEmployee(long employeeOid)
{
if (Model == null)
try
{
RedirectToActionPermanent("Index", "Login");
return;
if (Model == null)
{
RedirectToActionPermanent("Index", "Login");
return;
}
Model.SelectedEmployee = MainModel.AllEmployees.First(f => f.EmployeeOid.Equals(employeeOid));
}
catch (Exception e)
{
log.Error(e.Message, e);
throw e;
}
Model.SelectedEmployee = MainModel.AllEmployees.First(f => f.EmployeeOid.Equals(employeeOid));
}
public string CheckToken(string token)

View File

@@ -219,12 +219,18 @@ namespace Host
}
}
int month = Int32.Parse(Request.Params["m"]);
int ansicht = 0;
if (Request.Params["ansicht"] != null)
{
ansicht = Int32.Parse(Request.Params["ansicht"]);
}
int month = Int32.Parse(Request.Params["m"]);
var year = Int32.Parse(Request.Params["y"]);
var start = new DateTime(year, month, 1);
var end = start.AddMonths(1);
return reportCreator.CreateEmployeeHourReport(employeeOid, teamOids, start, end);
return reportCreator.CreateEmployeeHourReport(employeeOid, teamOids, start, end, ansicht);
}
private XtraReport CreateAuslastungReport()

View File

@@ -48,7 +48,7 @@ namespace BeWo.Report
public abstract XtraReport CreateAdditionalServiceBookingReport(long addServiceRegionOid, Monat month, int year);
public abstract XtraReport CreateEmployeeHourReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate);
public abstract XtraReport CreateEmployeeHourReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate, int ansicht);
public abstract XtraReport CreateAuslastungReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate);

View File

@@ -448,7 +448,7 @@ namespace BeWo.Report
return report as XtraReport;
}
public override XtraReport CreateEmployeeHourReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate)
public override XtraReport CreateEmployeeHourReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate, int ansicht)
{
IBeWoReport<MitarbeiterstundenkontoRO> report;

View File

@@ -320,7 +320,9 @@
<Compile Include="ReportObjects\JahresReportRO.cs" />
<Compile Include="ReportObjects\MedVerListRO.cs" />
<Compile Include="ReportObjects\MitarbeiterauslastungRO.cs" />
<Compile Include="ReportObjects\MitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="ReportObjects\MitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="ReportObjects\MitarbeiterstundenkontoMonateRO.cs" />
<Compile Include="ReportObjects\MitarbeiterstundenkontoRO.cs" />
<Compile Include="ReportObjects\Settlement2RO.cs" />
<Compile Include="ReportObjects\ServiceInvoiceRO.cs" />

View File

@@ -4,6 +4,7 @@ using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace AdikKleve
@@ -32,7 +33,7 @@ namespace AdikKleve
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = img;
xrBox.Image = Utils.CropImage(img);
}
else
{

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,12 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace AdikKleve
{
@@ -20,7 +26,10 @@ namespace AdikKleve
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
if (s.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(s);
servicesBillable.Add(s);
}
}
pRO.Services = servicesBillable;
@@ -28,5 +37,31 @@ namespace AdikKleve
this.bindingSource1.DataSource = pRO;
}
private void xrPictureBox1_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs 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);
Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public Image ByteArrayToImage(byte[] byteArrayIn)
{
Image returnImage = null;
MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
returnImage = Image.FromStream(ms);
return returnImage;
}
}
}

View File

@@ -51,6 +51,25 @@
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Export\CustomDataExporter.cs" />
<Compile Include="Export\DiamantExporter.cs" />
<Compile Include="Abwesenheitstage.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Abwesenheitstage.designer.cs">
<DependentUpon>Abwesenheitstage.cs</DependentUpon>
</Compile>
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
@@ -82,8 +101,27 @@
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Translation\TranslationDictionary.cs" />
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Abwesenheitstage.resx">
<DependentUpon>Abwesenheitstage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
@@ -105,6 +143,9 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
@@ -124,5 +165,6 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -15,7 +15,28 @@ namespace AlphaEv
{
public class CustomReportCreator : DefaultReportCreator
{
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
public override XtraReport CreateEmployeeHourReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate, int ansicht)
{
if (ansicht == 0)
{
return base.CreateEmployeeHourReport(employeeOid, teamOids, startDate, endDate, ansicht);
}
else
{
var report = new MitarbeiterstundenkontoJahr();
var jahrStart = new DateTime(startDate.Year, 1, 1);
var ds = new MitarbeiterstundenkontoMonateRO(employeeOid, teamOids, jahrStart, endDate, null);
report.SetReportDataSource(ds);
return report;
}
}
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
//List<ServicesOverviewRO> lROs =

View File

@@ -41,7 +41,7 @@ namespace AlphaEv
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellUnterschriftHeader = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -53,10 +53,10 @@ namespace AlphaEv
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellUnterschrift = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbsenceTime = new DevExpress.XtraReports.UI.XRLabel();
this.lblSummeStunden = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
@@ -75,8 +75,8 @@ namespace AlphaEv
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblSummeMinuten = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiterDatum = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleRowInvisible = new DevExpress.XtraReports.UI.FormattingRule();
@@ -99,6 +99,8 @@ namespace AlphaEv
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.lblUnterschriftKlientDatum = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -140,7 +142,7 @@ namespace AlphaEv
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell9});
this.cellUnterschriftHeader});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow3.StylePriority.UseTextAlignment = false;
@@ -190,11 +192,11 @@ namespace AlphaEv
this.xrTableCell7.Text = "Gruppen-TN Anz.";
this.xrTableCell7.Weight = 0.75108627464578881D;
//
// xrTableCell9
// cellUnterschriftHeader
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Unterschrift";
this.xrTableCell9.Weight = 1.7704176473793594D;
this.cellUnterschriftHeader.Name = "cellUnterschriftHeader";
this.cellUnterschriftHeader.Text = "Unterschrift";
this.cellUnterschriftHeader.Weight = 1.7704176473793594D;
//
// DetailReport
//
@@ -245,7 +247,7 @@ namespace AlphaEv
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell14,
this.xrTableCell16});
this.cellUnterschrift});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.StylePriority.UsePadding = false;
this.xrTableRow6.StylePriority.UseTextAlignment = false;
@@ -325,15 +327,15 @@ namespace AlphaEv
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell14.Weight = 0.088383820628113785D;
//
// xrTableCell16
// cellUnterschrift
//
this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.cellUnterschrift.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox2});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell16.Weight = 0.20833329216210483D;
this.cellUnterschrift.Name = "cellUnterschrift";
this.cellUnterschrift.StylePriority.UsePadding = false;
this.cellUnterschrift.StylePriority.UseTextAlignment = false;
this.cellUnterschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.cellUnterschrift.Weight = 0.20833329216210483D;
//
// xrPictureBox2
//
@@ -350,7 +352,9 @@ namespace AlphaEv
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.lblUnterschriftKlientDatum,
this.lblUnterschriftKlient,
this.lblAbsenceTime,
this.lblSummeStunden,
this.xrLabel12,
this.xrLabel11,
@@ -360,24 +364,24 @@ namespace AlphaEv
this.lblKeineGruppe,
this.xrTable2,
this.lblSummeMinuten,
this.xrLabel5,
this.xrLabel6});
this.lblUnterschriftMitarbeiterDatum,
this.lblUnterschriftMitarbeiter});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupFooter1.HeightF = 181.2917F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel7
// lblAbsenceTime
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
this.lblAbsenceTime.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 158.2917F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(674.9998F, 23F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "xrLabel7";
this.lblAbsenceTime.Font = new System.Drawing.Font("Arial", 10F);
this.lblAbsenceTime.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 158.2917F);
this.lblAbsenceTime.Name = "lblAbsenceTime";
this.lblAbsenceTime.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbsenceTime.SizeF = new System.Drawing.SizeF(674.9998F, 23F);
this.lblAbsenceTime.StylePriority.UseFont = false;
this.lblAbsenceTime.Text = "lblAbsenceTime";
//
// lblSummeStunden
//
@@ -577,33 +581,33 @@ namespace AlphaEv
this.lblSummeMinuten.StylePriority.UseTextAlignment = false;
this.lblSummeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel5
// lblUnterschriftMitarbeiterDatum
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(230F, 111.2918F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "Datum";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftMitarbeiterDatum.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiterDatum.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftMitarbeiterDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 111.2918F);
this.lblUnterschriftMitarbeiterDatum.Name = "lblUnterschriftMitarbeiterDatum";
this.lblUnterschriftMitarbeiterDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiterDatum.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseBorders = false;
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseFont = false;
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseTextAlignment = false;
this.lblUnterschriftMitarbeiterDatum.Text = "Datum";
this.lblUnterschriftMitarbeiterDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel6
// lblUnterschriftMitarbeiter
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 111.2918F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "Unterschrift (Fallverantwortlich)";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 111.2918F);
this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false;
this.lblUnterschriftMitarbeiter.Text = "Unterschrift (Fallverantwortlich)";
this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// GroupHeader1
//
@@ -804,6 +808,36 @@ namespace AlphaEv
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// lblUnterschriftKlientDatum
//
this.lblUnterschriftKlientDatum.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlientDatum.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftKlientDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 70.5417F);
this.lblUnterschriftKlientDatum.Name = "lblUnterschriftKlientDatum";
this.lblUnterschriftKlientDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftKlientDatum.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.lblUnterschriftKlientDatum.StylePriority.UseBorders = false;
this.lblUnterschriftKlientDatum.StylePriority.UseFont = false;
this.lblUnterschriftKlientDatum.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlientDatum.Text = "Datum";
this.lblUnterschriftKlientDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftKlientDatum.Visible = false;
//
// lblUnterschriftKlient
//
this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 70.5417F);
this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.lblUnterschriftKlient.StylePriority.UseBorders = false;
this.lblUnterschriftKlient.StylePriority.UseFont = false;
this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlient.Text = "Unterschrift (Klient/in)";
this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftKlient.Visible = false;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -858,8 +892,8 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
private DevExpress.XtraReports.UI.XRLabel lblSummeMinuten;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiterDatum;
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
@@ -883,12 +917,12 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell cellUnterschriftHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell cellUnterschrift;
private DevExpress.XtraReports.UI.XRLabel lblSummeStunden;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
@@ -906,7 +940,9 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGruppe;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblAbsenceTime;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlientDatum;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
}
}

View File

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using BeWo.Service.ServiceImplementations;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
@@ -32,7 +33,9 @@ namespace AlphaEv
double minutesEinzel = 0;
double minutesGruppe = 0;
bool hatUnterschrift = false;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -58,7 +61,10 @@ namespace AlphaEv
s.Notice4 = "";
}
if (!String.IsNullOrEmpty(s.Signature))
{
hatUnterschrift = true;
}
servicesBillable.Add(s);
}
@@ -91,6 +97,29 @@ namespace AlphaEv
{
lblKeineAbwesenheiten.Text = "";
}
if (!hatUnterschrift)
{
cellUnterschriftHeader.Visible = false;
cellUnterschrift.Visible = false;
lblUnterschriftKlientDatum.Visible = true;
lblUnterschriftKlient.Visible = true;
lblUnterschriftKlientDatum.Location = lblUnterschriftMitarbeiterDatum.Location;
lblUnterschriftKlient.Location = lblUnterschriftMitarbeiter.Location;
lblUnterschriftMitarbeiterDatum.Top += 80;
lblUnterschriftMitarbeiter.Top += 80;
lblAbsenceTime.Top += 80;
}
else
{
lblUnterschriftKlientDatum.Visible = false;
lblUnterschriftKlient.Visible = false;
}
//var approved = pRO.ApprovedFLSPerWeek;
//var stats = GetStatistics(pRO);
@@ -160,7 +189,7 @@ namespace AlphaEv
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = img;
xrBox.Image = Utils.CropImage(img);
}
else
{

View File

@@ -38,7 +38,7 @@ namespace AlphaEv
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellUnterschriftHeader = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -47,10 +47,10 @@ namespace AlphaEv
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellUnterschrift = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbsenceTime = new DevExpress.XtraReports.UI.XRLabel();
this.lblSummeStunden = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
@@ -62,8 +62,8 @@ namespace AlphaEv
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblSummeMinuten = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiterDatum = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleRowInvisible = new DevExpress.XtraReports.UI.FormattingRule();
@@ -86,6 +86,8 @@ namespace AlphaEv
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.lblUnterschriftKlientDatum = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -124,7 +126,7 @@ namespace AlphaEv
this.xrTableCell2,
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell9});
this.cellUnterschriftHeader});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow3.StylePriority.UseTextAlignment = false;
@@ -154,11 +156,11 @@ namespace AlphaEv
this.xrTableCell4.Text = "Mitarbeiter";
this.xrTableCell4.Weight = 0.96568235311601414D;
//
// xrTableCell9
// cellUnterschriftHeader
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Unterschrift";
this.xrTableCell9.Weight = 2.2532588239373665D;
this.cellUnterschriftHeader.Name = "cellUnterschriftHeader";
this.cellUnterschriftHeader.Text = "Unterschrift";
this.cellUnterschriftHeader.Weight = 2.2532588239373665D;
//
// DetailReport
//
@@ -206,7 +208,7 @@ namespace AlphaEv
this.xrTableCell8,
this.xrTableCell15,
this.xrTableCell10,
this.xrTableCell16});
this.cellUnterschrift});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.StylePriority.UsePadding = false;
this.xrTableRow6.StylePriority.UseTextAlignment = false;
@@ -256,15 +258,15 @@ namespace AlphaEv
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell10.Weight = 0.11363634325918627D;
//
// xrTableCell16
// cellUnterschrift
//
this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.cellUnterschrift.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox2});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell16.Weight = 0.26515148391336996D;
this.cellUnterschrift.Name = "cellUnterschrift";
this.cellUnterschrift.StylePriority.UsePadding = false;
this.cellUnterschrift.StylePriority.UseTextAlignment = false;
this.cellUnterschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.cellUnterschrift.Weight = 0.26515148391336996D;
//
// xrPictureBox2
//
@@ -281,30 +283,32 @@ namespace AlphaEv
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.lblUnterschriftKlientDatum,
this.lblUnterschriftKlient,
this.lblAbsenceTime,
this.lblSummeStunden,
this.xrLabel12,
this.xrLabel11,
this.xrTable2,
this.lblSummeMinuten,
this.xrLabel5,
this.xrLabel6});
this.lblUnterschriftMitarbeiterDatum,
this.lblUnterschriftMitarbeiter});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupFooter1.HeightF = 181.2917F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel7
// lblAbsenceTime
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
this.lblAbsenceTime.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 158.2917F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(674.9998F, 23F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "xrLabel7";
this.lblAbsenceTime.Font = new System.Drawing.Font("Arial", 10F);
this.lblAbsenceTime.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 158.2917F);
this.lblAbsenceTime.Name = "lblAbsenceTime";
this.lblAbsenceTime.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbsenceTime.SizeF = new System.Drawing.SizeF(674.9998F, 23F);
this.lblAbsenceTime.StylePriority.UseFont = false;
this.lblAbsenceTime.Text = "lblAbsenceTime";
//
// lblSummeStunden
//
@@ -421,33 +425,33 @@ namespace AlphaEv
this.lblSummeMinuten.StylePriority.UseTextAlignment = false;
this.lblSummeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel5
// lblUnterschriftMitarbeiterDatum
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(230F, 111.2918F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "Datum";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftMitarbeiterDatum.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiterDatum.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftMitarbeiterDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 111.2918F);
this.lblUnterschriftMitarbeiterDatum.Name = "lblUnterschriftMitarbeiterDatum";
this.lblUnterschriftMitarbeiterDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiterDatum.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseBorders = false;
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseFont = false;
this.lblUnterschriftMitarbeiterDatum.StylePriority.UseTextAlignment = false;
this.lblUnterschriftMitarbeiterDatum.Text = "Datum";
this.lblUnterschriftMitarbeiterDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel6
// lblUnterschriftMitarbeiter
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 111.2918F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "Unterschrift (Fallverantwortlich)";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 111.2918F);
this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false;
this.lblUnterschriftMitarbeiter.Text = "Unterschrift (Fallverantwortlich)";
this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// GroupHeader1
//
@@ -648,6 +652,36 @@ namespace AlphaEv
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// lblUnterschriftKlientDatum
//
this.lblUnterschriftKlientDatum.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlientDatum.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftKlientDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 70.70834F);
this.lblUnterschriftKlientDatum.Name = "lblUnterschriftKlientDatum";
this.lblUnterschriftKlientDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftKlientDatum.SizeF = new System.Drawing.SizeF(117F, 29.4583F);
this.lblUnterschriftKlientDatum.StylePriority.UseBorders = false;
this.lblUnterschriftKlientDatum.StylePriority.UseFont = false;
this.lblUnterschriftKlientDatum.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlientDatum.Text = "Datum";
this.lblUnterschriftKlientDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftKlientDatum.Visible = false;
//
// lblUnterschriftKlient
//
this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 70.70834F);
this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F);
this.lblUnterschriftKlient.StylePriority.UseBorders = false;
this.lblUnterschriftKlient.StylePriority.UseFont = false;
this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlient.Text = "Unterschrift (Klient/in)";
this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblUnterschriftKlient.Visible = false;
//
// StundenzettelAssistenz
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -702,8 +736,8 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
private DevExpress.XtraReports.UI.XRLabel lblSummeMinuten;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiterDatum;
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
@@ -724,9 +758,9 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell cellUnterschriftHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell cellUnterschrift;
private DevExpress.XtraReports.UI.XRLabel lblSummeStunden;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
@@ -737,7 +771,9 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell cellGesamtEinzel;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblAbsenceTime;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlientDatum;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
}
}

View File

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using BeWo.Service.ServiceImplementations;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
@@ -35,6 +36,8 @@ namespace AlphaEv
double minutesEinzel = 0;
double minutesGruppe = 0;
bool hatUnterschrift = false;
Dictionary<string, string> cats = new Dictionary<string, string>();
if (pRO.Services != null)
{
@@ -47,9 +50,12 @@ namespace AlphaEv
minutesEinzel += s.Minutes;
s.Notice = String.Format("{0:0.##}", s.Minutes);
if (!String.IsNullOrEmpty(s.Signature))
{
hatUnterschrift = true;
}
servicesBillable.Add(s);
}
@@ -65,8 +71,29 @@ namespace AlphaEv
lblSummeMinuten.Text = string.Format("{0:0.##}", minutesEinzel + minutesGruppe);
lblSummeStunden.Text = string.Format("{0:0.##}", (minutesEinzel + minutesGruppe) / 60);
if (!hatUnterschrift)
{
cellUnterschriftHeader.Visible = false;
cellUnterschrift.Visible = false;
lblUnterschriftKlientDatum.Visible = true;
lblUnterschriftKlient.Visible = true;
lblUnterschriftKlientDatum.Location = lblUnterschriftMitarbeiterDatum.Location;
lblUnterschriftKlient.Location = lblUnterschriftMitarbeiter.Location;
lblUnterschriftMitarbeiterDatum.Top += 80;
lblUnterschriftMitarbeiter.Top += 80;
lblAbsenceTime.Top += 80;
}
else
{
lblUnterschriftKlientDatum.Visible = false;
lblUnterschriftKlient.Visible = false;
}
var stats = GetStatistics(pRO);
if (stats != null)
{
@@ -134,7 +161,7 @@ namespace AlphaEv
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = img;
xrBox.Image = Utils.CropImage(img);
}
else
{

View File

@@ -88,7 +88,7 @@ namespace ApiBerlin
DateTime day = span.StartDate;
while (day < end && day < span.EndDate)
{
if (day.DayOfWeek != DayOfWeek.Sunday)
if (day.DayOfWeek != DayOfWeek.Sunday && !IstRealFeiertag(day))
{
if (!tage.HasValue)
tage = 0;
@@ -232,5 +232,42 @@ namespace ApiBerlin
{
return new List<DateTime>();
}
}
private bool IstRealFeiertag(DateTime start)
{
List<DateTime> feiertage = GetRealFeiertage(start.Year);
foreach (var ft in feiertage)
{
if (start.Date == ft)
return true;
}
return false;
}
private List<DateTime> GetRealFeiertage(int year)
{
List<DateTime> list = new List<DateTime>();
list.Add(new DateTime(year, 1, 1)); // "Neujahr"));
list.Add(new DateTime(year, 5, 1)); // , "Tag der Arbeit"));
list.Add(new DateTime(year, 10, 3)); // , "Tag der dt. Einheit"));
list.Add(new DateTime(year, 12, 25)); // , "1. Weihnachtstag"));
list.Add(new DateTime(year, 12, 26)); // , "2. Weihnachtstag"));
if (year == 2017)
{
list.Add(new DateTime(year, 10, 31)); // , "Reformationstag"));
}
DateTime osterSonntag = GetOsterSonntag(year);
list.Add(osterSonntag.AddDays(-2)); // , "Karfreitag"));
list.Add(osterSonntag.AddDays(1)); // , "Ostermontag"));
list.Add(osterSonntag.AddDays(39)); // , "Christi Himmelfahrt"));
list.Add(osterSonntag.AddDays(50)); // , "Pfingstmontag"));
return list;
}
}
}

View File

@@ -123,9 +123,9 @@ namespace AwoDortmund.Export
{
Decimal.TryParse(betragObj.ToString().Replace(".", ","), out gesamtbetrag);
}
decimal betrag1 = gesamtbetrag * 0.1643m;
decimal betrag2 = gesamtbetrag * 0.8213m;
decimal betrag3 = gesamtbetrag * 0.0144m;
decimal betrag1 = Math.Round(gesamtbetrag * 0.1643m, 2, MidpointRounding.AwayFromZero);
decimal betrag2 = Math.Round(gesamtbetrag * 0.8213m, 2, MidpointRounding.AwayFromZero);
decimal betrag3 = gesamtbetrag - betrag1 - betrag2;
@@ -237,7 +237,7 @@ SELECT
'114',
null,
'BEWO',
'DA',
'AR',
':Abrechnungsmonat',
':Periode',
null,
@@ -307,7 +307,7 @@ SELECT
'114',
null,
'BEWO',
'DA',
'AR',
':Abrechnungsmonat',
':Periode',
GetNextBelegnr(0),
@@ -369,10 +369,10 @@ ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
SELECT
'F',
'0',
'xxx',
'114',
null,
'BEWO',
'DA',
'AR',
':Abrechnungsmonat',
':Periode',
GetNextBelegnr(0),

View File

@@ -73,10 +73,22 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -38,6 +38,7 @@ namespace CaritasGuenzburgNeuUlm
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -47,9 +48,18 @@ namespace CaritasGuenzburgNeuUlm
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -58,9 +68,11 @@ namespace CaritasGuenzburgNeuUlm
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblRechnungsbetrag = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.lblEuro = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
@@ -70,17 +82,6 @@ namespace CaritasGuenzburgNeuUlm
this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.lblEuro = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.lblRechnungsbetrag = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -168,6 +169,13 @@ namespace CaritasGuenzburgNeuUlm
this.xrTableCell7.Text = "Klient";
this.xrTableCell7.Weight = 0.41456060833172925D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Mitarbeiter";
this.xrTableCell1.Weight = 0.19508734603091166D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -268,11 +276,34 @@ namespace CaritasGuenzburgNeuUlm
//
// xrTableCell10
//
this.xrTableCell10.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox2});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.21464642494837044D;
//
// xrPictureBox2
//
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(170F, 25F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.xrPictureBox2.StylePriority.UseBorders = false;
this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox2_BeforePrint);
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.10101007700573778D;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -283,6 +314,10 @@ namespace CaritasGuenzburgNeuUlm
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -308,6 +343,71 @@ namespace CaritasGuenzburgNeuUlm
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "geb.: {0:dd.MM.yyyy}")});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(829.9998F, 86.58333F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(200F, 18F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
//
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(829.9998F, 115F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(237.7086F, 18.00001F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "[Month] [Year]";
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(509.7086F, 115F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(229.9998F, 18.00001F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Leistungsnachweis für Zeitraum:";
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(204.8543F, 49.09447F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(829.2918F, 25F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Leistungsnachweis für geleistete Betreuungsstunden in der ambulanten Betreuung";
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(221.7082F, 0F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(829.2918F, 25F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Qualitätsverbund Nordschwaben - Caritasverband für die Region Günzburg und Neu-Ul" +
"m e.V.";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(56.36636F, 74.09447F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
//
// xrLabel29
//
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(80.00005F, 86.58333F);
@@ -377,14 +477,6 @@ namespace CaritasGuenzburgNeuUlm
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(56.36636F, 74.09447F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 50F;
@@ -404,6 +496,50 @@ namespace CaritasGuenzburgNeuUlm
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// lblRechnungsbetrag
//
this.lblRechnungsbetrag.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblRechnungsbetrag.LocationFloat = new DevExpress.Utils.PointFloat(405.0827F, 0F);
this.lblRechnungsbetrag.Multiline = true;
this.lblRechnungsbetrag.Name = "lblRechnungsbetrag";
this.lblRechnungsbetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblRechnungsbetrag.SizeF = new System.Drawing.SizeF(268.6249F, 40.83335F);
this.lblRechnungsbetrag.StylePriority.UseBorders = false;
this.lblRechnungsbetrag.StylePriority.UseFont = false;
this.lblRechnungsbetrag.StylePriority.UsePadding = false;
this.lblRechnungsbetrag.StylePriority.UseTextAlignment = false;
this.lblRechnungsbetrag.Text = "Ergibt Rechnungsbetrag ……………………… €";
this.lblRechnungsbetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(249.9995F, 40.83335F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(155.0832F, 40.83335F);
this.xrLabel12.StylePriority.UseBorders = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UsePadding = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.Text = "(vereinbarter Stundensatz)";
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// lblEuro
//
this.lblEuro.LocationFloat = new DevExpress.Utils.PointFloat(249.9995F, 0F);
this.lblEuro.Multiline = true;
this.lblEuro.Name = "lblEuro";
this.lblEuro.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblEuro.SizeF = new System.Drawing.SizeF(155.0832F, 40.83335F);
this.lblEuro.StylePriority.UseBorders = false;
this.lblEuro.StylePriority.UseFont = false;
this.lblEuro.StylePriority.UsePadding = false;
this.lblEuro.StylePriority.UseTextAlignment = false;
this.lblEuro.Text = "mal ... Euro";
this.lblEuro.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
@@ -483,127 +619,6 @@ namespace CaritasGuenzburgNeuUlm
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(221.7082F, 0F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(829.2918F, 25F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Qualitätsverbund Nordschwaben - Caritasverband für die Region Günzburg und Neu-Ul" +
"m e.V.";
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(204.8543F, 49.09447F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(829.2918F, 25F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Leistungsnachweis für geleistete Betreuungsstunden in der ambulanten Betreuung";
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.10101007700573778D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Mitarbeiter";
this.xrTableCell1.Weight = 0.19508734603091166D;
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(509.7086F, 115F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(229.9998F, 18.00001F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Leistungsnachweis für Zeitraum:";
//
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(829.9998F, 115F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(237.7086F, 18.00001F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "[Month] [Year]";
//
// xrLabel10
//
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "geb.: {0:dd.MM.yyyy}")});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(829.9998F, 86.58333F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(200F, 18F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
//
// lblEuro
//
this.lblEuro.LocationFloat = new DevExpress.Utils.PointFloat(249.9995F, 0F);
this.lblEuro.Multiline = true;
this.lblEuro.Name = "lblEuro";
this.lblEuro.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblEuro.SizeF = new System.Drawing.SizeF(155.0832F, 40.83335F);
this.lblEuro.StylePriority.UseBorders = false;
this.lblEuro.StylePriority.UseFont = false;
this.lblEuro.StylePriority.UsePadding = false;
this.lblEuro.StylePriority.UseTextAlignment = false;
this.lblEuro.Text = "mal ... Euro";
this.lblEuro.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(249.9995F, 40.83335F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(155.0832F, 40.83335F);
this.xrLabel12.StylePriority.UseBorders = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UsePadding = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.Text = "(vereinbarter Stundensatz)";
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// lblRechnungsbetrag
//
this.lblRechnungsbetrag.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblRechnungsbetrag.LocationFloat = new DevExpress.Utils.PointFloat(405.0827F, 0F);
this.lblRechnungsbetrag.Multiline = true;
this.lblRechnungsbetrag.Name = "lblRechnungsbetrag";
this.lblRechnungsbetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblRechnungsbetrag.SizeF = new System.Drawing.SizeF(268.6249F, 40.83335F);
this.lblRechnungsbetrag.StylePriority.UseBorders = false;
this.lblRechnungsbetrag.StylePriority.UseFont = false;
this.lblRechnungsbetrag.StylePriority.UsePadding = false;
this.lblRechnungsbetrag.StylePriority.UseTextAlignment = false;
this.lblRechnungsbetrag.Text = "Ergibt Rechnungsbetrag ……………………… €";
this.lblRechnungsbetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -694,5 +709,6 @@ namespace CaritasGuenzburgNeuUlm
private DevExpress.XtraReports.UI.XRLabel lblRechnungsbetrag;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel lblEuro;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
}
}

View File

@@ -1,8 +1,16 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraReports.UI;
namespace CaritasGuenzburgNeuUlm
{
@@ -25,6 +33,8 @@ namespace CaritasGuenzburgNeuUlm
if (s.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(s);
minutes += s.Minutes;
servicesBillable.Add(s);
}
@@ -34,8 +44,60 @@ namespace CaritasGuenzburgNeuUlm
}
pRO.TotalFLSString = String.Format("{0:0.00}", minutes / 60);
decimal stundensatz = GetStundensatz(pRO);
lblEuro.Text = String.Format("mal {0:0.00} Euro", stundensatz);
lblRechnungsbetrag.Text = String.Format("Ergibt Rechnungsbetrag {0:c}", (double)stundensatz * (minutes / 60));
this.bindingSource1.DataSource = pRO;
}
private void xrPictureBox2_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs 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);
Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public Image ByteArrayToImage(byte[] byteArrayIn)
{
Image returnImage = null;
MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
returnImage = Image.FromStream(ms);
return returnImage;
}
private decimal GetStundensatz(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate);
if (cp != null && cp.CostRateValue.HasValue)
{
return cp.CostRateValue.Value;
}
}
return 0;
}
}
}

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -47,9 +47,9 @@ namespace LeWoAachen
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = 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();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
@@ -70,11 +70,10 @@ namespace LeWoAachen
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -84,12 +83,19 @@ namespace LeWoAachen
this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -178,7 +184,8 @@ namespace LeWoAachen
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.GroupFooter1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -281,10 +288,6 @@ namespace LeWoAachen
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.19570704439348488D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -316,6 +319,14 @@ namespace LeWoAachen
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(445.2271F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(281.7729F, 218.2308F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
//
// xrLabel28
//
this.xrLabel28.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
@@ -526,25 +537,29 @@ namespace LeWoAachen
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// ReportFooter
// xrRichText3
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.xrLabel8,
this.xrLabel2,
this.xrLabel6,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 8F);
this.ReportFooter.HeightF = 195.1667F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
this.xrRichText3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(95)))), ((int)(((byte)(145)))));
this.xrRichText3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrRichText3.BorderWidth = 5F;
this.xrRichText3.CanGrow = false;
this.xrRichText3.Font = new System.Drawing.Font("Verdana", 9.75F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(701.0231F, 61.26925F);
this.xrRichText3.StylePriority.UseBorderColor = false;
this.xrRichText3.StylePriority.UseBorders = false;
this.xrRichText3.StylePriority.UseBorderWidth = false;
this.xrRichText3.StylePriority.UsePadding = false;
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(435.1247F, 177.1667F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(128.0001F, 153.7292F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(197F, 17.99997F);
@@ -570,7 +585,7 @@ namespace LeWoAachen
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel2.BorderWidth = 2F;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(264F, 48.21002F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(264F, 48.21F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
@@ -583,17 +598,6 @@ namespace LeWoAachen
this.xrLabel2.Text = "[fieldBillableFLS!0.##] x 1,2 = [fieldAbrechenbareFLS!0.##] Std.";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(183.1248F, 177.1667F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(216.8751F, 17.99997F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Unterschrift Mitarbeiter/in";
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F);
@@ -628,7 +632,7 @@ namespace LeWoAachen
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(12.12489F, 177.1667F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 153.7292F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(117F, 17.99997F);
@@ -674,32 +678,106 @@ namespace LeWoAachen
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// xrRichText3
// GroupFooter1
//
this.xrRichText3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(95)))), ((int)(((byte)(145)))));
this.xrRichText3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrRichText3.BorderWidth = 5F;
this.xrRichText3.CanGrow = false;
this.xrRichText3.Font = new System.Drawing.Font("Verdana", 9.75F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(701.0231F, 61.26925F);
this.xrRichText3.StylePriority.UseBorderColor = false;
this.xrRichText3.StylePriority.UseBorders = false;
this.xrRichText3.StylePriority.UseBorderWidth = false;
this.xrRichText3.StylePriority.UsePadding = false;
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel17,
this.xrLabel7,
this.xrLabel5,
this.xrLabel2,
this.xrLabel8,
this.xrLabel4,
this.xrLabel3});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupFooter1.HeightF = 213.5425F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrPictureBox1
// DetailReport1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(445.2271F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(281.7729F, 218.2308F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2});
this.DetailReport1.DataMember = "AllEmployees";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 1;
this.DetailReport1.Name = "DetailReport1";
//
// Detail2
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel13,
this.xrLabel14,
this.xrLabel15,
this.xrLabel16});
this.Detail2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail2.HeightF = 42F;
this.Detail2.Name = "Detail2";
this.Detail2.StylePriority.UseFont = false;
//
// xrLabel13
//
this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(125F, 12F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(200F, 25F);
this.xrLabel13.StylePriority.UseBorders = false;
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel14
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllEmployees.EmployeeName")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(125F, 25F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "xrLabel6";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel15
//
this.xrLabel15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllEmployees.TotalFLM", "{0:0.##}")});
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(325F, 17F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(58F, 25F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
this.xrLabel15.Text = "xrLabel7";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel16
//
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(392F, 17F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(100F, 25F);
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.Text = "FLM";
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.5425F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(333F, 25F);
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.Text = "Ich versichere die Richtigkeit der o.g. Angaben:";
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
@@ -709,7 +787,7 @@ namespace LeWoAachen
this.ReportHeader,
this.topMarginBand1,
this.bottomMarginBand1,
this.ReportFooter});
this.DetailReport1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldAbrechenbareMinuten,
this.fieldTotalFLSBillable,
@@ -731,8 +809,8 @@ namespace LeWoAachen
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -760,7 +838,6 @@ namespace LeWoAachen
private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
@@ -787,7 +864,6 @@ namespace LeWoAachen
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
@@ -795,5 +871,13 @@ namespace LeWoAachen
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
}
}

View File

@@ -62,7 +62,10 @@ namespace LebenshilfeAhrweiler
this.xrTableCell71 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.cellGesamtAh = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamtFl = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrTable23 = new DevExpress.XtraReports.UI.XRTable();
@@ -87,6 +90,7 @@ namespace LebenshilfeAhrweiler
this.xrTable18 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow35 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable19 = new DevExpress.XtraReports.UI.XRTable();
@@ -149,17 +153,11 @@ namespace LebenshilfeAhrweiler
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.cellZuLeistenFl = new DevExpress.XtraReports.UI.XRTableCell();
this.cellZuLeistenAh = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamtFl = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamtAh = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable21)).BeginInit();
@@ -176,6 +174,7 @@ namespace LebenshilfeAhrweiler
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -362,8 +361,7 @@ namespace LebenshilfeAhrweiler
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.GroupHeader1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -508,17 +506,68 @@ namespace LebenshilfeAhrweiler
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// bindingSource1
// cellGesamtAh
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.cellGesamtAh.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtAh.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtAh.LocationFloat = new DevExpress.Utils.PointFloat(850.9999F, 25F);
this.cellGesamtAh.Multiline = true;
this.cellGesamtAh.Name = "cellGesamtAh";
this.cellGesamtAh.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtAh.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtAh.StylePriority.UseBorders = false;
this.cellGesamtAh.StylePriority.UseFont = false;
this.cellGesamtAh.StylePriority.UseTextAlignment = false;
this.cellGesamtAh.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// cellGesamtFl
//
this.cellGesamtFl.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtFl.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtFl.LocationFloat = new DevExpress.Utils.PointFloat(850.9999F, 0F);
this.cellGesamtFl.Multiline = true;
this.cellGesamtFl.Name = "cellGesamtFl";
this.cellGesamtFl.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtFl.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtFl.StylePriority.UseBorders = false;
this.cellGesamtFl.StylePriority.UseFont = false;
this.cellGesamtFl.StylePriority.UseTextAlignment = false;
this.cellGesamtFl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(464.9999F, 25F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "geleistete Stunden alltagsb. Hilfen:";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel8
//
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(464.9999F, 0F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "geleistete Stunden Fachleistung:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -778,6 +827,18 @@ namespace LebenshilfeAhrweiler
this.xrTableCell57.StylePriority.UseFont = false;
this.xrTableCell57.Weight = 1.3991421197902285D;
//
// xrPageInfo2
//
this.xrPageInfo2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPageInfo2.Font = new System.Drawing.Font("Calibri", 12F);
this.xrPageInfo2.Format = "Seite {0}/{1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(116F, 10.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(97F, 18F);
this.xrPageInfo2.StylePriority.UseBorders = false;
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrTableRow36
//
this.xrTableRow36.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -1184,9 +1245,6 @@ namespace LebenshilfeAhrweiler
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -1194,9 +1252,6 @@ namespace LebenshilfeAhrweiler
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -1204,9 +1259,6 @@ namespace LebenshilfeAhrweiler
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -1225,6 +1277,10 @@ namespace LebenshilfeAhrweiler
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.cellGesamtAh,
this.xrLabel10,
this.cellGesamtFl,
this.xrLabel8,
this.xrLabel9,
this.lblUebertragNachstenMonatFl,
this.xrLabel6,
@@ -1234,14 +1290,15 @@ namespace LebenshilfeAhrweiler
this.xrLabel4,
this.xrLabel3,
this.xrLabel2});
this.ReportFooter.HeightF = 72.00008F;
this.ReportFooter.HeightF = 122.0001F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel9.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(718.9999F, 49.99996F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(719F, 100F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1256,7 +1313,7 @@ namespace LebenshilfeAhrweiler
//
this.lblUebertragNachstenMonatFl.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblUebertragNachstenMonatFl.Font = new System.Drawing.Font("Calibri", 12F);
this.lblUebertragNachstenMonatFl.LocationFloat = new DevExpress.Utils.PointFloat(827F, 50F);
this.lblUebertragNachstenMonatFl.LocationFloat = new DevExpress.Utils.PointFloat(827F, 100F);
this.lblUebertragNachstenMonatFl.Multiline = true;
this.lblUebertragNachstenMonatFl.Name = "lblUebertragNachstenMonatFl";
this.lblUebertragNachstenMonatFl.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1270,7 +1327,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel6.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(881.9994F, 49.99996F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(882F, 100F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1285,7 +1342,7 @@ namespace LebenshilfeAhrweiler
//
this.lblUebertragNachstenMonatAh.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblUebertragNachstenMonatAh.Font = new System.Drawing.Font("Calibri", 12F);
this.lblUebertragNachstenMonatAh.LocationFloat = new DevExpress.Utils.PointFloat(1017F, 49.99996F);
this.lblUebertragNachstenMonatAh.LocationFloat = new DevExpress.Utils.PointFloat(1017F, 100F);
this.lblUebertragNachstenMonatAh.Multiline = true;
this.lblUebertragNachstenMonatAh.Name = "lblUebertragNachstenMonatAh";
this.lblUebertragNachstenMonatAh.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1299,7 +1356,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(791.9996F, 18.00003F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(792F, 68F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1314,7 +1371,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel5.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(359.9999F, 49.99996F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(360F, 100F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1326,7 +1383,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1341,7 +1398,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(71.99999F, 18.00003F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(72F, 68F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1353,7 +1410,7 @@ namespace LebenshilfeAhrweiler
//
this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18.00003F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1472,86 +1529,6 @@ namespace LebenshilfeAhrweiler
this.cellZuLeistenAh.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.cellZuLeistenAh.Weight = 0.69204879043387646D;
//
// xrPageInfo2
//
this.xrPageInfo2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPageInfo2.Font = new System.Drawing.Font("Calibri", 12F);
this.xrPageInfo2.Format = "Seite {0}/{1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(116F, 10.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(97F, 18F);
this.xrPageInfo2.StylePriority.UseBorders = false;
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.cellGesamtAh,
this.cellGesamtFl,
this.xrLabel10,
this.xrLabel8});
this.GroupFooter1.HeightF = 50F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel8
//
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(465F, 0F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "geleistete Stunden Fachleistung:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(465F, 25F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "geleistete Stunden alltagsb. Hilfen:";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// cellGesamtFl
//
this.cellGesamtFl.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtFl.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtFl.LocationFloat = new DevExpress.Utils.PointFloat(851F, 0F);
this.cellGesamtFl.Multiline = true;
this.cellGesamtFl.Name = "cellGesamtFl";
this.cellGesamtFl.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtFl.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtFl.StylePriority.UseBorders = false;
this.cellGesamtFl.StylePriority.UseFont = false;
this.cellGesamtFl.StylePriority.UseTextAlignment = false;
this.cellGesamtFl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// cellGesamtAh
//
this.cellGesamtAh.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtAh.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtAh.LocationFloat = new DevExpress.Utils.PointFloat(850.9999F, 25F);
this.cellGesamtAh.Multiline = true;
this.cellGesamtAh.Name = "cellGesamtAh";
this.cellGesamtAh.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtAh.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtAh.StylePriority.UseBorders = false;
this.cellGesamtAh.StylePriority.UseFont = false;
this.cellGesamtAh.StylePriority.UseTextAlignment = false;
this.cellGesamtAh.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1577,6 +1554,10 @@ namespace LebenshilfeAhrweiler
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1604,11 +1585,10 @@ namespace LebenshilfeAhrweiler
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "13.2";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable21)).EndInit();
@@ -1625,6 +1605,7 @@ namespace LebenshilfeAhrweiler
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1749,7 +1730,6 @@ namespace LebenshilfeAhrweiler
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;

View File

@@ -283,7 +283,7 @@ namespace LebenshilfeKoblenz
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLS")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00} h/Wo")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Weight = 0.20120086766455705D;
@@ -324,6 +324,7 @@ namespace LebenshilfeKoblenz
//
this.cellTelefon.Name = "cellTelefon";
this.cellTelefon.StylePriority.UseTextAlignment = false;
this.cellTelefon.Text = "0261 963553-0";
this.cellTelefon.Weight = 0.49385671218593624D;
//
// xrTableRow4
@@ -1337,7 +1338,6 @@ namespace LebenshilfeKoblenz
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(240.0029F, 89.99996F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(119.9967F, 40.00001F);
this.xrLabel11.StylePriority.UseBackColor = false;
this.xrLabel11.StylePriority.UseBorders = false;
@@ -1345,7 +1345,7 @@ namespace LebenshilfeKoblenz
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "[Month] [Year]";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel10
//

View File

@@ -27,7 +27,9 @@ namespace LebenshilfeKoblenz
double minutenFahrt = 0;
double minutenAusfall = 0;
double gesamtMinuten = 0;
decimal kmGesamt = 0;
Dictionary<String, String> empDict = new Dictionary<string, string>();
Dictionary<decimal, decimal> betragZuMinuten = new Dictionary<decimal, decimal>();
if (pRO.Services != null)
{
@@ -83,10 +85,31 @@ namespace LebenshilfeKoblenz
betragZuMinuten[preis.Value] += (decimal)s.Minutes;
}
if (!empDict.ContainsKey(s.EmployeeFullname))
{
empDict.Add(s.EmployeeFullname, s.EmployeeFullname);
}
if (!String.IsNullOrWhiteSpace(s.GefahreneKilometer) && s.GefahreneKilometer != "0")
{
decimal km = 0;
if (Decimal.TryParse(s.GefahreneKilometer, out km))
{
kmGesamt += km;
}
}
}
}
if (empDict.Count == 1)
{
pRO.MainAttendant = empDict.Values.First();
}
cellFachkraftTraeger.Text = pRO.MainAttendant;
gesamtMinuten = minutenDirekt + minutenIndirekt + minutenFallbeglAz + minutenFahrt + minutenAusfall;
cellSummeDf.Text = String.Format("{0:0.00}", minutenDirekt / 60);
@@ -94,7 +117,7 @@ namespace LebenshilfeKoblenz
cellSummeFa.Text = String.Format("{0:0.00}", minutenFallbeglAz / 60);
cellSummeFz.Text = String.Format("{0:0.00}", minutenFahrt / 60);
cellSummeUa.Text = String.Format("{0:0.00}", minutenAusfall / 60);
cellSummeKm.Text = String.Format("{0:0.##}", pRO.TotalGefahreneKilometer);
cellSummeKm.Text = String.Format("{0:0.##}", kmGesamt);
cellDirektFLS.Text = String.Format("{0:0.00}", minutenDirekt / 60);
cellIndirektFLS.Text = String.Format("{0:0.00}", minutenIndirekt / 60);
@@ -105,13 +128,13 @@ namespace LebenshilfeKoblenz
cellSummeBlatt2.Text = String.Format("{0:0.00}", gesamtMinuten / 60);
//cellSummeAllerStunden.Text = String.Format("{0:0.00}", gesamtMinuten / 60);
cellSummeKmBlatt2.Text = String.Format("{0:0.##}", pRO.TotalGefahreneKilometer);
cellSummeKmBlatt2.Text = String.Format("{0:0.##}", kmGesamt);
cellBetragKm.Text = String.Format("{0:0.00} €", Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
cellBetragKm.Text = String.Format("{0:0.00} €", Math.Round(kmGesamt * 0.3m, 2, MidpointRounding.AwayFromZero));
var gesamtPreis = SetzePreise(betragZuMinuten);
cellRechnungsbetrag.Text = String.Format("{0:0.00} €", gesamtPreis + (decimal)Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
cellRechnungsbetrag.Text = String.Format("{0:0.00} €", gesamtPreis + (decimal)Math.Round(kmGesamt * 0.3m, 2, MidpointRounding.AwayFromZero));
if (gesamtMinuten > 0)
{
@@ -178,7 +201,7 @@ namespace LebenshilfeKoblenz
private void SetKopfdaten(ServicesOverviewRO pRO)
{
Person ansprechpartner = null;
Employee fachkraft = null;
//Employee fachkraft = null;
DateTime? hpGespraech = null;
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
@@ -197,54 +220,58 @@ namespace LebenshilfeKoblenz
if (vle.SystemEntryID != null &&
vle.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
{
fachkraft = e2c.Employee;
//fachkraft = e2c.Employee;
}
}
}
hpGespraech = c2s.SupportConcept.ConferenceDate;
foreach (var varfield in customer.VarFieldValueList)
if (customer.AssistanceBegin.HasValue)
{
if (varfield.VarFieldDefOid == 1)
{
var varFieldValue = Utils.XMLDeserializeFromString(varfield.SerializedValue, typeof(DateTime));
if (varFieldValue != null)
{
String str = varFieldValue.ToString();
DateTime dt;
if (DateTime.TryParse(str, out dt))
{
cellBeginn.Text = String.Format("{0:dd.MM.yyyy}", dt);
}
}
}
cellBeginn.Text = String.Format("{0:dd.MM.yyyy}", customer.AssistanceBegin);
}
//foreach (var varfield in customer.VarFieldValueList)
//{
// if (varfield.VarFieldDefOid == 1)
// {
// var varFieldValue = Utils.XMLDeserializeFromString(varfield.SerializedValue, typeof(DateTime));
// if (varFieldValue != null)
// {
// String str = varFieldValue.ToString();
// DateTime dt;
// if (DateTime.TryParse(str, out dt))
// {
// cellBeginn.Text = String.Format("{0:dd.MM.yyyy}", dt);
// }
// }
// }
//}
}
if (ansprechpartner != null)
{
cellFachkraftTraeger.Text =
cellFachkraftAsd.Text =
String.Format("{0} {1}", ansprechpartner.FirstName, ansprechpartner.LastName);
}
if (fachkraft != null)
{
cellFachkraftAsd.Text =
String.Format("{0} {1}", fachkraft.Person.FirstName, fachkraft.Person.LastName);
//if (fachkraft != null)
//{
// cellFachkraftTraeger.Text =
// String.Format("{0} {1}", fachkraft.Person.FirstName, fachkraft.Person.LastName);
var tel = fachkraft.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Phone);
if (tel != null)
{
cellTelefon.Text = tel.Value;
}
// //var tel = fachkraft.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Phone);
// //if (tel != null)
// //{
// // cellTelefon.Text = tel.Value;
// //}
}
//}
if (hpGespraech.HasValue)
{

View File

@@ -186,7 +186,7 @@ namespace PraxisPusteblume
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(140.4376F, 20F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Ansprechpartnerin:";
this.xrLabel1.Text = "Ansprechpartner:";
//
// xrRichText1
//

File diff suppressed because it is too large Load Diff

View File

@@ -29,7 +29,7 @@ namespace BeWo.SeWo
{
if (c.EmploymentType != null && !String.IsNullOrWhiteSpace(c.EmploymentType.Name))
{
if (c.EmploymentType.Name.Contains("Minijob"))
if (c.EmploymentType.Name.Contains("Minijob") || c.EmploymentType.Name.Contains("Werkstudent"))
{
if (empDetail.UeberstundenGesamt.HasValue)
{

View File

@@ -125,7 +125,7 @@ namespace BeWo.Service.Plugins
//t = "8872796313"; // WMB
//t = "6297638711"; // ASB Bergisch Gladbach
//t = "5553641242"; // RheinSupport (ehem. Aids und Drogenberatung)
//t = "1218057423"; // LH Koblenz
t = "1218057423"; // LH Koblenz
//t = "3517812158"; // Haus Theresia
//t = "7058292376"; // BeWo Heinsberg
//t = "3227700467"; // Psychosozialer Trägerverein
@@ -140,7 +140,7 @@ namespace BeWo.Service.Plugins
//t = "8828216586"; // Caritas Aachen
//t = "7062943632"; // ABW Elsebrock
//t = "3956369664"; // LH Wetterau
t = "3984525482"; // API Berlin
//t = "3984525482"; // API Berlin
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
@@ -164,25 +164,26 @@ namespace BeWo.Service.Plugins
//t = "7803602698"; // Taubblindendienst
//t = "5518600303"; // Wetterleuchten e.V.
//t = "4096649015"; // AWO Dortmund
//t = "3614251071"; // Pusteblume
//t = "7755740484"; // Sawo
//t = "8275654834"; // Twg Jonathan
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
//t = "2632162696"; // Pro BeWo Düren
//t = "6340891020"; // Caritas Ahlen
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach
//t = "2331203795"; // BeWo für dich
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe
//t = "5260936181"; // LORI
//t = "1931553444"; // HIBA
//t = "7185338722"; // BeWo Walz & Paiva
//t = "3196643272"; //Betreutes Wohnen Lisa Wöll
//t = "3432911735"; //Caritas Günzburg - Neu Ulm
//t = "2591682148"; //Humanitas
//t = "3614251071"; // Pusteblume
//t = "7755740484"; // Sawo
//t = "8275654834"; // Twg Jonathan
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
//t = "2632162696"; // Pro BeWo Düren
//t = "6340891020"; // Caritas Ahlen
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach
//t = "2331203795"; // BeWo für dich
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe
//t = "5260936181"; // LORI
//t = "1931553444"; // HIBA
//t = "7185338722"; // BeWo Walz & Paiva
//t = "3196643272"; // Betreutes Wohnen Lisa Wöll
//t = "3432911735"; // Caritas Günzburg - Neu Ulm
//t = "2591682148"; // Humanitas
//t = "9805564204"; // LeWo Aachen
//t = "7215356798"; // Triathlon
return t;
#else
if (MultitenancyOperationContextExt.Current != null)

View File

@@ -34,7 +34,13 @@ namespace BeWo.Service.Reporting
return new DateTime(ReportStartDate.Year, 12, 31);
}
}
protected virtual bool StichtagsbezogenAuswerten
{
get { return true; }
}
public virtual List<AnnualReportDC> CreateAnnualReport(CostBearer cb, long? teamOid, long? customerCareTypeValueListEntryOid, DateTime reportStartDate,
DateTime reportEndDate)
@@ -357,11 +363,21 @@ namespace BeWo.Service.Reporting
// anz Betreuungen
AnnualReportDC report = CreateCountPerYearReport();
reports.Add(report);
// anz Betreuungen
AnnualReportDC report;
// anz Zugänge
if (StichtagsbezogenAuswerten)
{
report = CreateCountPerYearReport();
reports.Add(report);
}
else
{
report = CreateCountPerYearReportGesamtJahr();
reports.Add(report);
}
// anz Zugänge
report = new AnnualReportDC();
report.Name = "Anzahl der Zugänge";
reports.Add(report);
@@ -824,8 +840,9 @@ namespace BeWo.Service.Reporting
}
if (startDate <= Stichtag && endDate >= Stichtag)
{
if ((StichtagsbezogenAuswerten && startDate <= Stichtag && endDate >= Stichtag)
|| (!StichtagsbezogenAuswerten && startDate <= Stichtag && endDate >= new DateTime(Stichtag.Year, 1, 1)))
{
if (!LiegtImStichtagByCustomerOid.ContainsKey(customer.Oid.Value))
{
LiegtImStichtagByCustomerOid.Add(customer.Oid.Value, true);
@@ -1008,7 +1025,109 @@ namespace BeWo.Service.Reporting
return report;
}
//Auswertung nach Jahr, mindestens ein Tag irgendwann im Jahr reicht um gezählt zu werden
public virtual AnnualReportDC CreateCountPerYearReportGesamtJahr()
{
var countPerYearAll = new Dictionary<int, int>();
var countPerYearMale = new Dictionary<int, int>();
var countPerYearFemale = new Dictionary<int, int>();
countPerYearAll.Add(ReportStartDate.Year, 0);
countPerYearAll.Add(ReportStartDate.Year - 1, 0);
countPerYearAll.Add(ReportStartDate.Year - 2, 0);
countPerYearMale.Add(ReportStartDate.Year, 0);
countPerYearMale.Add(ReportStartDate.Year - 1, 0);
countPerYearMale.Add(ReportStartDate.Year - 2, 0);
countPerYearFemale.Add(ReportStartDate.Year, 0);
countPerYearFemale.Add(ReportStartDate.Year - 1, 0);
countPerYearFemale.Add(ReportStartDate.Year - 2, 0);
foreach (var customerOid in Cb2ScListPerCustomerOid.Keys)
{
var customer = CustomerByOid[customerOid];
var c2sList = Cb2ScListPerCustomerOid[customerOid];
for (int i = ReportStartDate.Year - 2; i <= ReportStartDate.Year; i++)
{
DateTime start = new DateTime(i, 1, 1);
DateTime end = new DateTime(i, 12, 31);
bool counted = false;
bool isFirst = true;
foreach (var c2s in c2sList)
{
var startDate = c2s.StartDate;
if (isFirst && customer.AssistanceBegin.HasValue && customer.AssistanceBegin < startDate)
{
startDate = customer.AssistanceBegin;
}
isFirst = false;
var endDate = c2s.EndDate;
if (customer.TerminationDate.HasValue && customer.TerminationDate < endDate)
{
endDate = customer.TerminationDate;
}
if (!counted && startDate <= end && endDate >= start)
{
countPerYearAll[i] += 1;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
countPerYearMale[i] += 1;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
countPerYearFemale[i] += 1;
}
counted = true;
}
}
}
}
var report = new AnnualReportDC();
report.Name = "Anzahl der Betreuungen";
report.Data = new List<AnnualReportDataDC>();
DateTime startYear = new DateTime(2000, 1, 1); //reportStartDate.AddYears(-1); //Vorjahr
int index = 1;
while (startYear < ReportEndDate)
{
if (countPerYearAll.ContainsKey(startYear.Year))
{
AnnualReportDataDC data = new AnnualReportDataDC();
report.Data.Add(data);
data.Index = index++;
data.Name = String.Format("{0:yyyy}", new DateTime(startYear.Year, 1, 1));
data.Value = countPerYearAll[startYear.Year];
if (countPerYearMale.ContainsKey(startYear.Year))
{
data.Male = countPerYearMale[startYear.Year];
}
if (countPerYearFemale.ContainsKey(startYear.Year))
{
data.Female = countPerYearFemale[startYear.Year];
}
}
startYear = startYear.AddYears(1);
}
return report;
}
//Auswertung nach Jahr, mindestens ein Tag irgendwann im Jahr reicht um gezählt zu werden
public virtual AnnualReportDC CreateCountPerWholeYearReport()
{
var countPerYearAll = new Dictionary<int, int>();

View File

@@ -517,6 +517,41 @@ namespace BS.Shared.Core
return null;
}
public static Bitmap CropImage(Image image)
{
Bitmap originalBitmap = new Bitmap(image);
Point min = new Point(int.MaxValue, int.MaxValue);
Point max = new Point(int.MinValue, int.MinValue);
for (int x = 0; x < originalBitmap.Width; ++x)
{
for (int y = 0; y < originalBitmap.Height; ++y)
{
Color pixelColor = originalBitmap.GetPixel(x, y);
if (!(pixelColor.R == 255 && pixelColor.G == 255 && pixelColor.B == 255)
&& pixelColor.A > 0)
{
if (x < min.X) min.X = x;
if (y < min.Y) min.Y = y;
if (x > max.X) max.X = x;
if (y > max.Y) max.Y = y;
}
}
}
// Create a new bitmap from the crop rectangle
Rectangle cropRectangle = new Rectangle(min.X, min.Y, max.X - min.X, max.Y - min.Y);
Bitmap newBitmap = new Bitmap(cropRectangle.Width, cropRectangle.Height);
using (Graphics g = Graphics.FromImage(newBitmap))
{
g.DrawImage(originalBitmap, 0, 0, cropRectangle, GraphicsUnit.Pixel);
}
return newBitmap;
}
private static Size CalcSize(int originalWidth, int originalHeight, int desiredWidth, int desiredHeight)
{
var percentWidth = desiredWidth / (float)originalWidth;