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

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

Browse Source
This commit is contained in:
HirschleM
2026-05-08 12:59:37 +02:00
parent 9b37a6eb6b 5722f005ae
commit ef8165286a
34 changed files with 3014 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/BeWo.csproj
View File

@@ -43,12 +43,12 @@
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>ownSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.293</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.294</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>294</ApplicationRevision>
<ApplicationRevision>295</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

2
BeWo/BeWoApp.xaml.cs
View File

@@ -56,7 +56,7 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
public static string ShortVersion = "3.30.2";
public static string ShortVersion = "3.31";
public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
public static int RenderTier = 0;

25
BeWo/Styles/OrangeBlack.xaml
View File

@@ -4048,30 +4048,7 @@
FontSize="14"
Foreground="#FFD2D2D2"
Text="{Binding Path=Teams}" />
<TextBlock
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="5"
Margin="0,0,3,0"
VerticalAlignment="Center"
FontFamily="Microsoft Sans Serif"
FontSize="12"
Foreground="#FFD2D2D2">
<TextBlock.Visibility>
<Binding ConverterParameter="Employee" Path="IsDeleted">
<Binding.Converter>
<conv:AnonymizationRight2VisibilityConverter />
</Binding.Converter>
</Binding>
</TextBlock.Visibility>
<Hyperlink
Click="Hyperlink_Employee_Anonymize_Click"
Foreground="#FFF97E7B"
Tag="{Binding}"
TargetName="_NewWindow">
Anonymisieren
</Hyperlink>
</TextBlock>
<TextBlock
Grid.Row="0"
Grid.RowSpan="2"

8
BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs
View File

@@ -38,7 +38,7 @@ namespace BeWo.View.Controls.AI
public partial class AiPromptbausteinButton : UserControl
{
public static readonly DependencyProperty CanExecuteProperty =
DependencyProperty.Register("CanExecute", typeof(bool), typeof(AiPromptbausteinButton), new PropertyMetadata(true, OnCanExecuteChanged));
DependencyProperty.Register("CanExecute", typeof(bool), typeof(AiPromptbausteinButton), new PropertyMetadata(false, OnCanExecuteChanged));
public static readonly DependencyProperty StateProperty =
DependencyProperty.Register("State", typeof(AiPromptbausteinButtonState), typeof(AiPromptbausteinButton), new PropertyMetadata(AiPromptbausteinButtonState.Normal, OnStateChanged));
@@ -134,7 +134,11 @@ namespace BeWo.View.Controls.AI
private void UpdateState(AiPromptbausteinButtonState state)
{
if (state == AiPromptbausteinButtonState.Normal && !CanExecute)
state = AiPromptbausteinButtonState.Disabled;
{
State = AiPromptbausteinButtonState.Disabled;
return;
}
switch (state)
{

2
BeWo/View/Document/DokumentViewHelper.cs
View File

@@ -490,7 +490,7 @@ namespace BeWo.View.Document
var filename = selectedFolder.Name;
window.Close();
SaveRtfInBeWoFolder(defaultFolder, newRtfText, filename, objectTid, objectOid, folderSelectedAction);
SaveRtfInBeWoFolder(selectedFolder, newRtfText, filename, objectTid, objectOid, folderSelectedAction);
}

16
BeWo/View/Navigation/CustomerNavigationView.xaml
View File

@@ -119,21 +119,7 @@
Text="{Binding Path=MainAttendant}" />
<!-- Image x:Name="imgArchiv" Grid.Row="0" Grid.Column="2" Visibility="Collapsed" Grid.RowSpan="2" Source="..\Ressources\Icons\Archiv.png" Margin="0,0,5,0" Height="30" VerticalAlignment="Center" HorizontalAlignment="Stretch" Width="Auto" RenderTransformOrigin="0.5,0.5" / -->
<TextBlock
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="4"
Margin="0,0,3,0"
VerticalAlignment="Center"
Visibility="{Binding Path=IsDeleted, Converter={StaticResource AnonymizationRight2VisibilityConverter}, ConverterParameter=Customer}">
<Hyperlink
Click="Hyperlink_Anonymize_Click"
Foreground="#FFF97E7B"
Tag="{Binding}"
TargetName="_NewWindow">
Anonymisieren
</Hyperlink>
</TextBlock>
<TextBlock
Grid.Row="0"
Grid.RowSpan="2"

8
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -346,7 +346,7 @@ namespace BeWoPlanerMobil.Controllers
Model.ShowServiceRecordInsertedOn = !UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn);
Model.ShowSignature = UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.ShowSignature) && Model.HasRightToProvideSingleSignature;
Model.ShowDistanceField = UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.ShowDistanceFields);
var settingsValue = GetSettingValue(Model.Mandator.Settings, SettingsKeys.IsServiceRecordNoticeMandatory);
@@ -1530,8 +1530,8 @@ namespace BeWoPlanerMobil.Controllers
if(false == Model.IsInEditingMode)
{
if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature && (Model.NewServiceRecord.ServiceDescription.Category.IsBillable || Model.NewServiceRecord.ServiceDescription.Category.BillableAmount > 0m || Model.NewServiceRecord.ServiceDescription.BillableAmount > 0m))
{
//if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature && (Model.NewServiceRecord.ServiceDescription.Category.IsBillable || Model.NewServiceRecord.ServiceDescription.Category.BillableAmount > 0m || Model.NewServiceRecord.ServiceDescription.BillableAmount > 0m))
//{
var valRes = OperationsService.ValidateServiceRecord(Model.NewServiceRecord, null, 0, null, null);
var doppelt = valRes.Count > 0 && valRes.FirstOrDefault(v => v.ResultType == DoppelterEintrag) != null;
@@ -1550,7 +1550,7 @@ namespace BeWoPlanerMobil.Controllers
}
}
}
}
//}
if(appointmentPrototype is object)
{

6
BeWoPlanerMobil/Controllers/ReportController.cs
View File

@@ -1332,11 +1332,11 @@ namespace BeWoPlanerMobil.Controllers
var oids = quittierungsbelegItems.Select(s => s.ServiceRecordOid).ToList();
var hasCustomerSignature = srOids.All(a => serviceRecordOidsWithSignature.ContainsValueAtKey(SignatureType.Customer, a));
var hasCustomerSignature = oids.All(a => serviceRecordOidsWithSignature.ContainsValueAtKey(SignatureType.Customer, a));
var employeeSignatureState2 = GetSignatureState(srOids, serviceRecordOidsWithSignature, SignatureType.Employee);
var employeeSignatureState2 = GetSignatureState(oids, serviceRecordOidsWithSignature, SignatureType.Employee);
var customerSignatureState = GetSignatureState(srOids, serviceRecordOidsWithSignature, SignatureType.Customer);
var customerSignatureState = GetSignatureState(oids, serviceRecordOidsWithSignature, SignatureType.Customer);
var customerSignatureOid = hasCustomerSignature ? customerSignatures.FirstOrDefault(cs => cs.ServiceRecords.All(a => a.Customer.CustomerOid.Equals(reportObject.CustomerOid) && a.ServiceRecordOid.HasValue && serviceRecordOidsWithSignature[SignatureType.Customer].Contains(a.ServiceRecordOid.Value)))?.ConfirmationReceiptSignatureOid : null;
var sigs = customerSignatures.Where(cs => cs.ServiceRecords.All(a => a.Customer.CustomerOid.Equals(reportObject.CustomerOid) && a.ServiceRecordOid.HasValue && serviceRecordOidsWithSignature[SignatureType.Customer].Contains(a.ServiceRecordOid.Value))).ToList();

16
Data/Security/UserRightHelper.cs
View File

@@ -191,7 +191,9 @@ namespace BeWo.Data.Security
return "3.29";
if (isRightVersion330(r))
return "3.30";
return BASE_VERSION;
if (isRightVersion331(r))
return "3.31";
return BASE_VERSION;
}
private static bool isRightVersion322(UserRightType r)
@@ -240,5 +242,15 @@ namespace BeWo.Data.Security
|| r == UserRightType.AiVoiceView;
}
}
private static bool isRightVersion331(UserRightType r)
{
return r == UserRightType.VorlagenEditAll
|| r == UserRightType.VorlagenEditOwnTeams
|| r == UserRightType.VorlagenViewAll
|| r == UserRightType.VorlagenViewOwnTeams
|| r == UserRightType.Customer_CreateMedication
|| r == UserRightType.Customer_DeleteMedication;
}
}
}

2
Model/Changes_2026-04-20 AiPromptroutine 2.txt
View File

@@ -2,7 +2,7 @@ INSERT INTO `.executedscripts`
VALUES ('Changes_2026-04-20 AiPromptroutine 2', CURDATE());
ALTER TABLE `aipromptroutine`
RENAME TO `aipromptbauteinroutine` ;
RENAME TO `aipromptbausteinroutine` ;
ALTER TABLE `aipromptroutinestep`
RENAME TO `aipromptbausteinroutinestep` ;

163
Report/DefaultReports/Mitarbeiterauslastung.designer.cs generated
View File

@@ -55,6 +55,14 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -69,18 +77,10 @@ namespace BeWo.Report.DefaultReports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -288,7 +288,7 @@ namespace BeWo.Report.DefaultReports
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Kostentr<EFBFBD>ger";
this.xrTableCell1.Text = "Kostenträger";
this.xrTableCell1.Weight = 0.15329125478030678D;
//
// xrTableCell9
@@ -313,6 +313,77 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter1.Level = 1;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrTable2
//
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(697F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
// xrTableCell11
//
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Gesamt (zum Monatsende)";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell11.Weight = 0.18034254096455143D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 0.15329111579090118D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Weight = 0.1249972614437581D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Text = "cellSollGesamt";
this.xrTableCell14.Weight = 0.0849316752773914D;
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FreiProWoche")});
this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
xrSummary1.FormatString = "{0:0.00}";
this.xrTableCell15.Summary = xrSummary1;
this.xrTableCell15.TextFormatString = "{0:0.00}";
this.xrTableCell15.Weight = 0.0849316752773914D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -433,76 +504,6 @@ namespace BeWo.Report.DefaultReports
this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalEmp.Name = "fieldTotalEmp";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FreiProWoche")});
this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
xrSummary1.FormatString = "{0:0.00}";
this.xrTableCell15.Summary = xrSummary1;
this.xrTableCell15.Weight = 0.0849316752773914D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Text = "cellSollGesamt";
this.xrTableCell14.Weight = 0.0849316752773914D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Weight = 0.1249972614437581D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 0.15329111579090118D;
//
// xrTableCell11
//
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Gesamt (zum Monatsende)";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell11.Weight = 0.18034254096455143D;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
// xrTable2
//
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(697F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// Mitarbeiterauslastung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -531,8 +532,8 @@ namespace BeWo.Report.DefaultReports
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

50
ReportImp/BeWoImFlow/CustomReportCreator.cs
View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using DevExpress.XtraReports.UI;
@@ -12,13 +10,16 @@ namespace BeWoImFlow
{
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
if (lROs.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(lROs[0]);
rootReport.CreateDocument();
if (rootReport.Pages.Count == 0)
{
rootReport.CreateDocument();
}
for (int i = 1; i < lROs.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(lROs[i]);
@@ -31,20 +32,49 @@ namespace BeWoImFlow
return new XtraReport();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
{
var roList = new List<ServicesOverviewRO>();
foreach (var coid in customerOids)
{
var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid);
if (ro != null)
{
roList.Add(ro);
}
}
if (roList.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(roList[0]);
rootReport.CreateDocument();
for (int i = 1; i < roList.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(roList[i]);
lNext.CreateDocument();
rootReport.Pages.AddRange(lNext.Pages);
}
return rootReport;
}
return new XtraReport();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
return CreateServicesOverviewReportForRo(ro);
}
public override XtraReport CreateReportForServicesOverviewRo(ServicesOverviewRO ro, string reportId)
public override XtraReport CreateReportForServicesOverviewRo(ServicesOverviewRO ro, string reportId)
{
return CreateServicesOverviewReportForRo(ro);
return CreateServicesOverviewReportForRo(ro);
}
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
{
IBeWoReport<ServicesOverviewRO> report = null;

65
ReportImp/BeWoImFlow/Quittierungsbeleg.Designer.cs generated
View File

@@ -116,9 +116,6 @@ namespace BeWoImFlow
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -302,9 +299,9 @@ namespace BeWoImFlow
this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(6.103516E-05F, 0F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(160F, 35.00002F);
this.picSignature.SizeF = new System.Drawing.SizeF(160F, 31.99999F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint);
@@ -550,10 +547,6 @@ namespace BeWoImFlow
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell49.Weight = 0.44692737430167606D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -729,9 +722,6 @@ namespace BeWoImFlow
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblUnterschriftKlient,
this.xrPictureBox2,
this.xrLabel18,
this.xrLabel17,
this.xrPictureBox1,
this.xrLabel9,
@@ -853,7 +843,7 @@ namespace BeWoImFlow
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 91.45832F);
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 91.45831F);
this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -1096,7 +1086,7 @@ namespace BeWoImFlow
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatGruppen.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 91.45832F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 91.45831F);
this.lblHatGruppen.Name = "lblHatGruppen";
this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1119,7 +1109,7 @@ namespace BeWoImFlow
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 91.45832F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 91.45831F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
@@ -1128,7 +1118,7 @@ namespace BeWoImFlow
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45832F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45831F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1213,7 +1203,7 @@ namespace BeWoImFlow
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(329F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(86.00003F, 20F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(86.00002F, 20F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
@@ -1228,42 +1218,6 @@ namespace BeWoImFlow
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// lblUnterschriftKlient
//
this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 250F);
this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(304.5972F, 20F);
this.lblUnterschriftKlient.StylePriority.UseBackColor = false;
this.lblUnterschriftKlient.StylePriority.UseBorders = false;
this.lblUnterschriftKlient.StylePriority.UseFont = false;
this.lblUnterschriftKlient.StylePriority.UsePadding = false;
this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in";
this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(200.236F, 214.5F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel18
//
this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 214.5F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(105.2361F, 35.50002F);
this.xrLabel18.StylePriority.UseTextAlignment = false;
this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1284,7 +1238,7 @@ namespace BeWoImFlow
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 100F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PageWidth = 826;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
@@ -1384,8 +1338,5 @@ namespace BeWoImFlow
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
}
}

60
ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs generated
View File

@@ -28,7 +28,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -76,8 +75,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -88,7 +85,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingSource1 = new System.Windows.Forms.BindingSource();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
@@ -214,10 +211,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25007F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25002F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(323.5063F, 16.99999F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "[CreatorName]";
//
@@ -268,8 +266,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17,
this.xrLabel16,
this.xrLabel15,
this.xrLabel14,
this.xrLabel9,
this.xrLabel7,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
@@ -283,7 +279,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(481.25F, 175.25F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(481.2494F, 168.3333F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(204.75F, 22.20834F);
@@ -294,7 +290,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel35
//
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(481.25F, 151.2917F);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(481.2494F, 144.375F);
this.xrLabel35.Name = "xrLabel35";
this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel35.SizeF = new System.Drawing.SizeF(204.75F, 22.20834F);
@@ -573,7 +569,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 125.2501F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 118.3334F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -587,7 +583,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 108.2501F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 101.3334F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -602,7 +598,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel18.CanShrink = true;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 84.99998F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 78.08329F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -617,7 +613,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 68.00003F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 61.08332F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -632,7 +628,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel16.CanShrink = true;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 51.00002F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 44.08333F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -647,7 +643,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel15.CanShrink = true;
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 34.00002F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 27.08333F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -657,36 +653,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel15.Text = "Wilhelmstraße 50/52";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel14
//
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 17.00001F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel14.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Verwaltung";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel9
//
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Sylke Dohlen";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel7
//
this.xrLabel7.CanShrink = true;
@@ -1087,8 +1053,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;

4
ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs
View File

@@ -18,6 +18,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
public void SetReportDataSource(SettlementRO pRO)
{
if (pRO.CreatorName != null && pRO.CreatorName.Contains("Conrad"))
{
pRO.CreatorName += "\nAssistentin der Geschäftsführung";
}
var cb2sc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid));
DateTime bewilligungStart = cb2sc.ApprovedStartDate.HasValue ? cb2sc.ApprovedStartDate.Value : pRO.AccountingStartDate;

60
ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs generated
View File

@@ -29,7 +29,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -72,8 +71,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = 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();
@@ -90,7 +87,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingSource1 = new System.Windows.Forms.BindingSource();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -216,10 +213,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 102.4167F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.000406901F, 102.4167F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(328.5045F, 17.00001F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "[CreatorName]";
//
@@ -266,8 +264,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel30,
this.xrLabel31,
this.xrLabel20,
this.xrLabel9,
this.xrLabel14,
this.xrLabel15,
this.xrLabel16,
this.xrLabel17,
@@ -286,7 +282,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(509.7523F, 182.2502F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(509.7518F, 165.2502F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(181.2482F, 22.20834F);
@@ -400,7 +396,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel35
//
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(509.7523F, 160.0419F);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(509.7518F, 143.0419F);
this.xrLabel35.Name = "xrLabel35";
this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel35.SizeF = new System.Drawing.SizeF(181.2482F, 22.20834F);
@@ -584,42 +580,12 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "BAW Aachen – Wilhelmstraße 50/52 – 52070 Aachen";
//
// xrLabel9
//
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(426.0833F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Sylke Dohlen";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel14
//
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 17.00004F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel14.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Verwaltung";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel15
//
this.xrLabel15.CanShrink = true;
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 34.00005F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 17.00005F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -634,7 +600,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel16.CanShrink = true;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 51.00005F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 34.00006F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -649,7 +615,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 68.00006F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 51.00006F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -664,7 +630,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel18.CanShrink = true;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 85.00001F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 68.00001F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -678,7 +644,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 113.4584F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 96.45841F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -692,7 +658,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 130.4585F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 113.4585F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -1098,8 +1064,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;

6
ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.cs
View File

@@ -21,7 +21,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
public void SetReportDataSource(Settlement2RO pRO)
{
var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID<InvoiceBase>(pRO.InvoiceBaseOid.Value));
if (pRO.CreatorName != null && pRO.CreatorName.Contains("Conrad"))
{
pRO.CreatorName += "\nAssistentin der Geschäftsführung";
}
var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID<InvoiceBase>(pRO.InvoiceBaseOid.Value));
var sc = invoiceBase.SupportConceptCostBearerRelDc;
DateTime bewilligungStart = sc.ApprovedStartDate.HasValue ? sc.ApprovedStartDate.Value : pRO.AccountingStartDate;

9
ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs
View File

@@ -270,6 +270,15 @@ namespace HshCologne.Invoicing
stundensatz = preisAK;
ii.UnitDescription = "Assistenzkraft";
}
else if (qOid.Any(q => q == 1461))
{
stundensatz = preisFK;
}
else if (qOid.Any(q => q == 1462))
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft mit 2 jähriger BE";
}
}
// Erfstadt hat in der Familienhilfe teileweise noch den Sonderfall UMA, dort wird geringer bezahlt, Stundensatz nach Quali bei Organisation, sonst normal
// Erftstadt hat keine SB

1165
ReportImp/LebenshilfeKusel/GkvBegleitzettel.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

69
ReportImp/LebenshilfeKusel/GkvBegleitzettel.cs Normal file
View File

@@ -0,0 +1,69 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace LebenshilfeKusel
{
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
public GkvBegleitzettel()
{
this.InitializeComponent();
}
public void SetReportDataSource(GkvAbrechnungRO pRO)
{
xrPictureBox1.ImageSource = pRO.Logo;
if (pRO.KrankenkasseName.Equals("IKK SÜDWEST"))
{
pRO.ReceiverDatenannahmestelle = "IKK SÜDWEST";
pRO.ReceiverStreet = "Europaallee 3–4";
pRO.ReceiverPostCodeAndTown = "66113 Saarbrücken";
}
else if (pRO.KrankenkasseName.Equals("BKK Pfaff") || pRO.KrankenkasseName.Equals("HKK Krankenkasse"))
{
pRO.ReceiverDatenannahmestelle = "Abrechnungszentrum Emmendingen";
pRO.ReceiverStreet = "Bundesstraße 6";
pRO.ReceiverPostCodeAndTown = "79312 Emmendingen";
}
if (pRO.SenderWebsite.ToNullIfEmpty() is null)
xrTableRowSenderWebsite.Visible = false;
if (pRO.ReceiverContactPerson.ToNullIfEmpty() is null)
xrTableRowReceiverContactPerson.Visible = false;
/*
if (pRO.ReceiverDatenannahmestelle.ToNullIfEmpty() is null)
xrTableRowReceiverDatenannahmestelle.Visible = false;
*/
if (pRO.ReceiverDivision.ToNullIfEmpty() is null)
xrTableRowReceiverDivision.Visible = false;
/*
if (pRO.ReceiverStreet.ToNullIfEmpty() is null)
xrTableRowReceiverStreet.Visible = false;
if (pRO.ReceiverPostCodeAndTown.ToNullIfEmpty() is null)
xrTableRowReceiverPostCodeTown.Visible = false;
*/
if (pRO.SenderBankName.ToNullIfEmpty() is null ||
pRO.SenderBankIBAN.ToNullIfEmpty() is null ||
pRO.SenderBankName.ToNullIfEmpty() is null)
{
xrLineBankConnection.Visible = false;
xrRichTextBankConnection.Visible = false;
}
bindingSource1.DataSource = pRO;
}
}
}

123
ReportImp/LebenshilfeKusel/GkvBegleitzettel.resx Normal file
View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichTextBankConnection.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE0AZQB0AGEATQBlAGQAaQB1AG0ALQBSAG8AbQBhAG4AOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcACoAXABkAGUAZgBwAGEAcAAgAFwAdwBpAGQAYwB0AGwAcABhAHIAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXABmADEAXABmAHMAMgA0AFwAdQBsAFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAXABzAGEAMwAwAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkANAA5ADgAewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABbAFMAZQBuAGQAZQByAEIAYQBuAGsATgBhAG0AZQBdAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABJAEIAQQBOADoAIABbAFMAZQBuAGQAZQByAEIAYQBuAGsASQBCAEEATgBdAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABCAEkAQwA6ACAAWwBTAGUAbgBkAGUAcgBCAGEAbgBrAEIASQBDAF0AfQBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADEAXABmAHMAMgA0AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
</root>

10
ReportImp/LebenshilfeKusel/LebenshilfeKusel.csproj
View File

@@ -56,6 +56,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="GkvBegleitzettel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GkvBegleitzettel.Designer.cs">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
</Compile>
<Compile Include="NichtaerztlicheDialysesachleistungRechnung.cs">
<SubType>Component</SubType>
</Compile>
@@ -110,6 +116,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GkvBegleitzettel.resx">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="NichtaerztlicheDialysesachleistungRechnung.resx">
<DependentUpon>NichtaerztlicheDialysesachleistungRechnung.cs</DependentUpon>
<SubType>Designer</SubType>

11
ReportImp/PraxisPusteblume/IfsSammelRechnung.cs
View File

@@ -132,7 +132,7 @@ namespace PraxisPusteblume
{
i.ServiceDescription = "";
}
if (i.ServiceDescription == "Team")
if (i.ServiceDescription == "Team" || i.ServiceDescription == "Team (intern)")
{
teamPreis += i.NetAmount ?? 0;
teamStunden += i.UnitCount ?? 0;
@@ -142,7 +142,7 @@ namespace PraxisPusteblume
investPreis += i.NetAmount ?? 0;
investStunden += i.UnitCount ?? 0;
}
else if (i.ServiceDescription.Contains("Vernetzung"))
else if (i.ServiceDescription.Contains("Vernetzung") || i.ServiceDescription == "Team (extern)")
{
vernetzungPreis += i.NetAmount ?? 0;
vernetzungStunden = 1;
@@ -166,7 +166,7 @@ namespace PraxisPusteblume
mobilPreis += GetGrossAmount(i);
mobilStunden += i.UnitCount ?? 0;
}
else if (i.ServiceRecord.ServiceDescription.Name.ToLower().Contains("ambulant"))
else
{
ambulantPreis += GetGrossAmount(i);
ambulantStunden += i.UnitCount ?? 0;
@@ -257,12 +257,13 @@ namespace PraxisPusteblume
preisInvest = GetPreis(preise, "Invest (TS)", pRO.AccountingPeriodStart);
}
preisTeam = GetPreis(preise, "Team", pRO.AccountingPeriodStart);
preisTeam = GetPreis(preise, "Team (intern)", pRO.AccountingPeriodStart);
}
if (pRO.AccountingPeriodStart >= new DateTime(2025, 09, 01))
{
var preise = DAOFactory.GenericDAO.GetAllActive<Preis>();
preisVernetzung = GetPreis(preise, "Team Vernetzung", pRO.AccountingPeriodStart);
//preisVernetzung = GetPreis(preise, "Team Vernetzung", pRO.AccountingPeriodStart);
preisVernetzung = GetPreis(preise, "Team (extern)", pRO.AccountingPeriodStart);
preisGruppeInter = 42.18m;
}

8
ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs
View File

@@ -182,7 +182,7 @@ namespace PraxisPusteblume.Invoicing
private InvoiceItem CreateVernetzungInvoiceItem(SupportConceptApprovalPeriodDC scap, DateTimeSpan invoicePeriod)
{
var preisVernetzung = base.GetPreis("Team Vernetzung", invoicePeriod.StartDate);
var preisVernetzung = base.GetPreis("Team (extern)", invoicePeriod.StartDate);
var invoiceItem = new InvoiceItem();
invoiceItem.AmountPerUnit = preisVernetzung;
invoiceItem.UnitCount = 1;
@@ -191,7 +191,7 @@ namespace PraxisPusteblume.Invoicing
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = String.Format("Team Vernetzung");
invoiceItem.ItemDescription = String.Format("Team (extern)");
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
@@ -229,7 +229,7 @@ namespace PraxisPusteblume.Invoicing
}
if (invoicePeriod.StartDateTime >= new DateTime(2024,08,01))
{
betrag = base.GetPreis("Team", invoicePeriod.StartDate);
betrag = base.GetPreis("Team (intern)", invoicePeriod.StartDate);
}
var invoiceItem = new InvoiceItem();
@@ -240,7 +240,7 @@ namespace PraxisPusteblume.Invoicing
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = String.Format("Team");
invoiceItem.ItemDescription = String.Format("Team (intern)");
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;

15
ReportImp/SBBMainzReports/Invoicing/CustomInvoiceCreationQA.cs
View File

@@ -43,7 +43,7 @@ namespace SBBMainzReports.Invoicing
i.ServiceDescription.Category.ServiceCategoryOid;
return valid;
}).ToList();
if (cb2sc.CustomerReferenceNumber.Trim().EndsWith("b") || cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen"))
if (cb2sc.CustomerReferenceNumber != null && cb2sc.CustomerReferenceNumber.Trim().ToLower().EndsWith("b") || (cb2sc.AuswahlBezeichnung != null && cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen")))
{
bienen_ = true;
}
@@ -113,11 +113,11 @@ namespace SBBMainzReports.Invoicing
{
var calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
var scap = supportConceptApprovalPeriod;
var scapCrps = scap.ServiceCategory?.CostRatePeriods;
if (scapCrps != null && scapCrps.Count > 0)
var crList = scap.ServiceCategory.CostRatePeriods;
var cr = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, serviceInvoicePeriod.Start.Value);
if (cr != null && cr.CostRateValue.HasValue)
{
var hourlyRate = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs((IEnumerable<CostRatePeriod>)scapCrps).GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, serviceInvoicePeriod.Start.Value).CostRateValue;
decimal? hourlyRate = cr.CostRateValue.Value;
decimal weeklyFactor = 4.33m;
if (scap.StartDate.HasValue && scap.StartDate.Value.Day > 7)
{
@@ -154,6 +154,7 @@ namespace SBBMainzReports.Invoicing
ItemPeriodEnd = serviceInvoicePeriod.End,
AmountPerUnit = hourlyRate.Value,
ItemDescription = "Fachleistungseinheiten/Woche",
UnitDescription = "QA/Woche",
UnitCount = approvedHours
});
}
@@ -181,7 +182,7 @@ namespace SBBMainzReports.Invoicing
wegepauschale = base.GetPreis("Wegepauschale", invoicePeriod.StartDate);
int countWege = 0;
//Anzahl der Zeiterfassungseinträge, die nicht im Büro stattfinden
countWege = serviceRecordsInPeriod.Where(r => r.ServiceDescription.CategoryName.Contains("QA") && r.ServiceDescription.Name != "Büro").Count();
countWege = serviceRecordsInPeriod.Where(r => r.ServiceDescription.CategoryName.Contains("QA") && !r.ServiceDescription.Name.Contains("Büro")).Count();
if (countWege > 0)
{
@@ -194,7 +195,7 @@ namespace SBBMainzReports.Invoicing
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = "Wegepauschale/Wocche";
invoiceItem.ItemDescription = "Wegepauschale/Monat";
if (scap != null)
{
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;

25
ReportImp/SBBMainzReports/ServiceInvoiceReport.cs
View File

@@ -1,10 +1,12 @@
using System;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
using System;
using System.Linq;
using System.Text;
namespace SBBMainzReports
{
@@ -17,6 +19,7 @@ namespace SBBMainzReports
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
bool qa = false;
if (pRO.InvoiceBase.InvoiceTypeText != null && pRO.InvoiceBase.InvoiceTypeText.Contains("Storno"))
lblTitel.Text = "Stornorechnung";
@@ -60,9 +63,19 @@ namespace SBBMainzReports
{
lblUeberschrift.Text = "Hilfe zur Erziehung gemäß § 27 ff SGB VIII i.V. m. § 30 SGB VIII - \nErziehungsbeistandschaft";
}
if (sip.ServiceInvoiceItems.Any(i => i.ServiceDescription != null && i.ServiceDescription.Contains("QA")))
if (sip.ServiceInvoiceItems.Any(i => i.UnitDescription != null && i.UnitDescription.Contains("QA") || i.ServiceDescription != null && i.ServiceDescription.Contains("Fachleistungseinheit")))
{
lblUeberschrift.Text = "Qualifizierte Assistenz im Rahmen der Eingliederungshilfe \ngem. § 99 i.V.m. §§ 113-116 SGB IX";
lblUeberschrift.Text = "";
if (pRO.InvoiceBase != null && pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
{
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer2SupportConceptOid.Value);
if (pRO.CustomerReferenceNumber != null && pRO.CustomerReferenceNumber.Trim().ToLower().EndsWith("b") || (cb2sc.AuswahlBezeichnung != null && cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen")))
{
lblUeberschrift.Text = "Bienenprojekt\n";
}
}
lblUeberschrift.Text += "Qualifizierte Assistenz im Rahmen der Eingliederungshilfe \ngem. § 99 i.V.m. §§ 113-116 SGB IX";
qa = true;
}
if (sip.ServiceInvoiceItems.Any(i => i.ServiceDescription != null && i.ServiceDescription.Contains("Tagesstätte")))
{
@@ -70,7 +83,7 @@ namespace SBBMainzReports
}
foreach (var ii in sip.ServiceInvoiceItems)
{
if (!ii.ServiceDescription.ToLower().Contains("handgeld") && !ii.ServiceDescription.ToLower().Contains("hangeld"))
if (!ii.ServiceDescription.ToLower().Contains("handgeld") && !ii.ServiceDescription.ToLower().Contains("hangeld") && !qa)
{
ii.ServiceDescription = "Fachleistungstunden / Monat";
ii.HourlyRateString = String.Format("zu {0:0.00} €", ii.HourlyRate);

1034
ReportImp/SozialeDienstleistungenBeckerReports/RechnungIB.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

73
ReportImp/SozialeDienstleistungenBeckerReports/RechnungIB.cs Normal file
View File

@@ -0,0 +1,73 @@
using System;
using System.Text;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace BeWo.Report.DefaultReports
{
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
public ServiceInvoiceReport()
{
this.InitializeComponent();
}
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
}
else
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
if (pRO.CustomerSalutation.IsNullOrEmpty())
{
lblAnrede.Text = "Guten Tag,";
}
SetzeAdresse(pRO);
this.bindingSource1.DataSource = pRO;
}
private void SetzeAdresse(ServiceInvoiceRO pRO)
{
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
{
sb.AppendLine(pRO.RecipientOrganisation);
}
//if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1))
//{
// sb.AppendLine(pRO.RecipientAddressLine1);
//}
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
{
sb.AppendLine(pRO.RecipientContactPerson);
}
if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
{
sb.AppendLine(pRO.RecipientDivision);
}
if (!String.IsNullOrEmpty(pRO.RecipientPoBox))
{
sb.AppendLine(pRO.RecipientPoBox);
}
else if (!String.IsNullOrEmpty(pRO.RecipientStreet))
{
sb.AppendLine(pRO.RecipientStreet);
}
if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
{
sb.AppendLine(pRO.RecipientPostCodeAndTown);
}
lblAdresse.Text = sb.ToString();
}
}
}

120
ReportImp/SozialeDienstleistungenBeckerReports/RechnungIB.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

19
ReportImp/SozialeDienstleistungenBeckerReports/SozialeDienstleistungenBeckerReports.csproj
View File

@@ -125,6 +125,11 @@
<Compile Include="OverlappingServiceRecords.designer.cs">
<DependentUpon>OverlappingServiceRecords.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
@@ -132,6 +137,12 @@
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\CustomReportCreator.cs" />
<Compile Include="RechnungIB.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="RechnungIB.Designer.cs">
<DependentUpon>RechnungIB.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomHomeContentGenerator.cs" />
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
@@ -194,10 +205,18 @@
<EmbeddedResource Include="OverlappingServiceRecords.resx">
<DependentUpon>OverlappingServiceRecords.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="RechnungIB.resx">
<DependentUpon>RechnungIB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</EmbeddedResource>

BIN
ReportImp/SozialeDienstleistungenBeckerReports/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

7
Service/Plugins/PluginLoader.cs
View File

@@ -70,7 +70,7 @@ namespace BeWo.Service.Plugins
//t = "5351926758"; // Viva a Vida
//t = "2215396183"; // Diakonie Remscheid Lennep
//t = "5157599087"; // SHG Schwerte
t = "4526293996"; // Fortis
//t = "4526293996"; // Fortis
//t = "3647969417"; // Caritas Bottrop
//t = "3057313346"; // SSB Mainz
//t = "6246287823"; // BeWo Alsdorf
@@ -83,7 +83,7 @@ namespace BeWo.Service.Plugins
//t = "7282396774"; // Caritas Unna
//t = "6884855402"; // IBP
//t = "4867997795"; // ADiK Kleve
//t = "3184859776"; // Sergej Becker
t = "3184859776"; // Sergej Becker
//t = "7752610643"; // BWK Gbr
//t = "3785623125"; // Betreuwo
//t = "7130228334"; // LH Borken
@@ -213,7 +213,7 @@ namespace BeWo.Service.Plugins
//t = "7185105541"; // Nous GmbH
//t = "5022131330"; // Tabula Rasa
//t = "4189934785"; // Landshuter Netzwerke
t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR
//t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR
//t = "3678599942"; // VKM Rietberg
//t = "4069072369"; // BeWo Dreilich&Pastor (Projekt TranskulturellesBBPastor)
//t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich)
@@ -433,6 +433,7 @@ namespace BeWo.Service.Plugins
//t = "9885937567"; // Antje Boland - BeWo Boland
//t = "3829321035"; // Diakoniewerk Essen
//t = "3583014513"; // Bezirksverein für soziale Rechtspflege Villingen-Schwenningen Körperschaft des öffentlichen Rechts Sebastian Kopp
//t = "1561235939"; // Arya Steffens - Hevia Therapie
return t;
#else

4
Service/ServiceContracts/IUserService.cs
View File

@@ -78,12 +78,12 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequireWcfAuthorization(UserRightType.UserView_Create)]
[RequireWcfAuthorization(UserRightType.UserView_Create, UserRightType.CreateAll)]
long InsertNewUser(UserDC pUser);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequireWcfAuthorization(UserRightType.UserGroupView_Create)]
[RequireWcfAuthorization(UserRightType.UserGroupView_Create, UserRightType.CreateAll)]
long InsertNewUserGroup(UserGroupDC pUserGroup);
[FaultContract(typeof(BeWoFault))]

157
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -25,6 +25,7 @@ using BS.Shared.DataContracts.Reports;
using BS.Shared.Extensions;
using BS.Shared.Services;
using Dakota.Logic;
using DevExpress.DataProcessing;
using Newtonsoft.Json;
using RestSharp;
using System;
@@ -9116,9 +9117,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
//var resources = DAOFactory.GenericDAO.GetActiveByIDs<Resource>(resourceOids);
var list = new List<InactivePersonDC>();
return list;
//return list;
var sql = @"select null, p.Oid as personoid, p.FirstName, p.LastName, p.DateOfBirth, a.Street as Strasse, a.PostalCode as PLZ, a.Town as Ort, p.insts from person p
left join address a on p.Addressoid = a.Oid
where (p.isactive = 0 or p.isactive = 2) and (p.SystemEntryID is null || p.SystemEntryID != -1)
@@ -9130,7 +9130,7 @@ namespace BeWo.Service.ServiceImplementations
sql = @"select c.Oid, p.Oid as personoid, p.FirstName, p.LastName, p.DateOfBirth, a.Street as Strasse, a.PostalCode as PLZ, a.Town as Ort, p.insts from customer c
join person p on c.PersonOid = p.Oid
left join address a on p.Addressoid = a.Oid
where (p.isactive = 0 or p.isactive = 2) and (p.SystemEntryID is null || p.SystemEntryID != -1)
where (c.isactive = 0 or c.isactive = 2) and (c.SystemEntryID is null || c.SystemEntryID != -1)
and c.insts < DATE_SUB(CURDATE(), INTERVAL yyyy YEAR);";
}
else if (tableId == TableID.Employee)
@@ -9138,7 +9138,7 @@ namespace BeWo.Service.ServiceImplementations
sql = @"select e.Oid, p.Oid as personoid, p.FirstName, p.LastName, p.DateOfBirth, a.Street as Strasse, a.PostalCode as PLZ, a.Town as Ort, p.insts from employee e
join person p on e.PersonOid = p.Oid
left join address a on p.Addressoid = a.Oid
where (p.isactive = 0 or p.isactive = 2) and (p.SystemEntryID is null || p.SystemEntryID != -1)
where (e.isactive = 0 or e.isactive = 2) and (e.SystemEntryID is null || e.SystemEntryID != -1)
and e.insts < DATE_SUB(CURDATE(), INTERVAL yyyy YEAR)";
}
@@ -9165,6 +9165,18 @@ namespace BeWo.Service.ServiceImplementations
list.Add(ip);
}
if (tableId == TableID.Customer)
{
list = FilterInactiveCustomers(jahreUngenutzt, list);
}
else if (tableId == TableID.Employee)
{
list = FilterInactiveCustomers(jahreUngenutzt, list);
}
else
{
list = FilterInactiveCustomers(jahreUngenutzt,list);
}
return list;
}
catch (Exception e)
@@ -9173,12 +9185,147 @@ namespace BeWo.Service.ServiceImplementations
}
}
private List<InactivePersonDC> FilterInactiveCustomers(int jahreUngenutzt, List<InactivePersonDC> list)
{
var newList = new List<InactivePersonDC>();
var dict = list
.Where(x => x.ObjectOid.HasValue)
.ToDictionary(x => x.ObjectOid.Value, x => x);
//Hole alle Hilfepläne und prüfe, ob es noch einen aktiven gibt oder einen archivierten der jünger ist als die Frist
var sql = @"select sc.Oid, sc.CustomerOid
from supportconcept sc
WHERE
sc.CustomerOid in
(select c.Oid from customer c
where (c.isactive = 0 or c.isactive = 2) and (c.SystemEntryID is null || c.SystemEntryID != -1)
and c.insts < DATE_SUB(CURDATE(), INTERVAL yyyy YEAR))";
sql = sql.Replace("yyyy", jahreUngenutzt.ToString());
var sqlresult = DAOFactory.SearchDAO.GetSqlResult(sql);
var oidlist = new List<long>();
foreach (object[] row in sqlresult)
{
oidlist.Add((long)row[0]);
}
var scList = DAOFactory.GenericDAO.LoadByIDs<SupportConcept>(oidlist).GroupBy(s => s.Customer.Oid.Value);
foreach (var item in scList)
{
foreach (var sc in item)
{
if (sc.IsActive == ActivationTypeId.Active)
{
//HP noch aktiv->raus aus Liste
if (dict.ContainsKey(sc.Customer.Oid.Value))
{
dict.Remove(sc.Customer.Oid.Value);
}
break;
}
else if (sc.IsActive == ActivationTypeId.Archived)
{
//Prüfe ob Enddatum > Frist
if (sc.EndDate.HasValue && sc.EndDate > DateTime.Now.AddYears(jahreUngenutzt * -1))
{
if (dict.ContainsKey(sc.Customer.Oid.Value))
{
dict.Remove(sc.Customer.Oid.Value);
}
break;
}
}
}
//if (item.IsActive == ActivationTypeId.Active)
//{
// //HP noch aktiv->raus aus Liste
// if (dict.ContainsKey(item.Customer.Oid.Value))
// {
// dict.Remove(item.Customer.Oid.Value);
// }
//}
//else if (item.EndDate.HasValue)
}
//Prüfe, ob es einen ServiceRecord gibt, der innerhalb der Frist entstanden ist
sql = @"select sr.CustomerOid, max(sr.EndDate)
from servicerecord sr
WHERE
sr.EndDate > DATE_SUB(CURDATE(), INTERVAL 10 YEAR) and
sr.CustomerOid in
(select c.Oid from customer c
where (c.isactive = 0 or c.isactive = 2) and (c.SystemEntryID is null || c.SystemEntryID != -1)
and c.insts < DATE_SUB(CURDATE(), INTERVAL yyyy YEAR))
group by sr.CustomerOid";
sql = sql.Replace("yyyy", jahreUngenutzt.ToString());
sqlresult = DAOFactory.SearchDAO.GetSqlResult(sql);
oidlist = new List<long>();
foreach (object[] row in sqlresult)
{
oidlist.Add((long)row[0]);
}
foreach (var oid in oidlist)
{
//ServiceRecord der nach der innerhalb der letzten x Jahre entstanden ist -> Customer raus aus Liste
if (dict.ContainsKey(oid))
{
dict.Remove(oid);
}
}
//Zuletzt verwendet am zufügen:
//Prüfe, ob es einen ServiceRecord gibt, der innerhalb der Frist entstanden ist
var oidString = String.Join(",", dict.Keys);
sql = String.Format(@"select sr.CustomerOid, max(sr.EndDate)
from servicerecord sr
WHERE
sr.CustomerOid in ({0})
group by sr.CustomerOid", oidString);
sqlresult = DAOFactory.SearchDAO.GetSqlResult(sql);
oidlist = new List<long>();
foreach (object[] row in sqlresult)
{
long oid = (long)row[0];
var datum = (DateTime?)row[1];
if (dict.ContainsKey(oid))
{
dict[oid].LastUsedOn = datum;
}
}
newList = dict.Values.ToList();
return newList;
}
private bool CheckIfInactive(int jahreUngenutzt, InactivePersonDC item)
{
throw new NotImplementedException();
}
public String DeleteInactivePersons(List<InactivePersonDC> persons, bool anonymisieren)
{
try
{
return "Diese Funktion ist zur Zeit noch in Bearbeitung. Wir arbeiten mit Hochdruck daran, die Funktionalität fertigzustellen.";
String msg = "Die gewählten Personen wurden erfolgreich gelöscht.";
TableID tid = TableID.Person;