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

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

Browse Source
This commit is contained in:
Alexandra
2024-02-05 11:56:52 +01:00
parent 195d2417ab 38962df57a
commit 2e0da83c35
15 changed files with 1644 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -54,7 +54,7 @@ namespace BeWo.View.Detail.Accounting
this._NewGkvAbrechnungPopUpView.Closed += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceSync(svc => svc.InsertNewServiceInvoices(e.Data));
ServiceFacade.DoAccountingServiceSync(svc => svc.InsertNewGkvAbrechnungen(e.Data));
};
this._EquityInvoiceItemEditView = new EquityInvoiceItemEditView();
@@ -67,38 +67,6 @@ namespace BeWo.View.Detail.Accounting
RefreshGkvAbrechnungenList();
CheckRights();
/*
this._EquityInvoiceItemEditView.EditingFinished += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._EquityInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb));
};
this._GeneralInvoiceItemEditView.EditingFinished += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._GeneralInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb));
};
this._SettlementInvoiceItemEditView.EditingFinished += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._SettlementInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb));
};
this._SettlementInvoiceItemEditView2.EditingFinished += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._SettlementInvoiceItemEditView2.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb));
};
this._ServiceInvoiceItemEditView.EditingFinished += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._ServiceInvoiceItemEditView.ViewModel.DataContract.InvoiceBase.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb));
};
*/
}
private void CheckRights()
@@ -223,51 +191,6 @@ namespace BeWo.View.Detail.Accounting
private void btn_edit_Click(object sender, RoutedEventArgs e)
{
var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
/*
switch (vm.DataContract.Type)
{
case InvoiceType.CustomerEquity:
this._EquityInvoiceItemEditView.ViewModel = vm;
this.MainControl.ShowControlAsModalPopup(this._EquityInvoiceItemEditView);
break;
case InvoiceType.General:
this._GeneralInvoiceItemEditView.ViewModel = vm;
this.MainControl.ShowControlAsModalPopup(this._GeneralInvoiceItemEditView);
break;
case InvoiceType.Settlement:
ServiceFacade.DoAccountingServiceAsync(
s => s.GetSettlementByInvoiceBaseOid(vm.DataContract.InvoiceBaseOid.Value),
cb => this.Dispatch(
delegate
{
if (cb.InvoiceItems == null || cb.InvoiceItems.Count == 0 || cb.DifferentHourlyRateCount > 0)
{
this._SettlementInvoiceItemEditView.ViewModel = new SettlementVM(cb);
this.MainControl.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView);
}
else
{
this._SettlementInvoiceItemEditView2.ViewModel = new SettlementVM(cb);
this.MainControl.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView2);
}
}));
break;
case InvoiceType.Service:
ServiceFacade.DoAccountingServiceAsync(
s => s.GetServiceInvoiceByInvoiceBaseOid(vm.DataContract.InvoiceBaseOid.Value),
cb => this.Dispatch(
delegate
{
this._ServiceInvoiceItemEditView.ViewModel = new ServiceInvoiceVM(cb);
this.MainControl.ShowControlAsModalPopup(this._ServiceInvoiceItemEditView);
}));
break;
}
*/
}

15
BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs
View File

@@ -26,7 +26,7 @@ namespace BeWo.View.Detail.Accounting
{
this.InitializeComponent();
this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
(s, e) =>
{
this._Dcs.Clear();
@@ -36,7 +36,7 @@ namespace BeWo.View.Detail.Accounting
this.grid_newInvoices.View.Loaded += (s, e) => ((TableView)this.grid_newInvoices.View).BestFitColumns();
}
public event EventHandler<EventArgs<List<ServiceInvoiceDC>>> Closed;
public event EventHandler<EventArgs<List<GkvAbrechnungDC>>> Closed;
public GkvAbrechnungVM ViewModel
{
@@ -74,7 +74,11 @@ namespace BeWo.View.Detail.Accounting
_Dcs[i].InvoiceBase.InvoiceNumber = this._InvoiceNumbers[i];
}
this.Closed(this, new EventArgs<List<ServiceInvoiceDC>>(new List<ServiceInvoiceDC>(_Dcs)));
List<GkvAbrechnungDC> gkvAbrechnungen = new List<GkvAbrechnungDC>();
if (ViewModel != null)
gkvAbrechnungen.Add(_Viewmodel.CommitToDataContract());
this.Closed(this, new EventArgs<List<GkvAbrechnungDC>>(new List<GkvAbrechnungDC>(gkvAbrechnungen)));
}
}
@@ -82,7 +86,7 @@ namespace BeWo.View.Detail.Accounting
{
if (this._Dcs != null)
this._Dcs.Clear();
this.Fire();
this.Fire();
}
private void btn_create_Click(object sender, RoutedEventArgs e)
@@ -126,7 +130,8 @@ namespace BeWo.View.Detail.Accounting
{
popup_organisation.IsOpen = false;
gkvsearchview.ItemSelected -= gkvsearchview_OrganisationSelected;
//ViewModel.IKEmpfang = e.Data.IKEmpfang;
if (ViewModel != null)
ViewModel.IKEmpfang = e.Data.Name;
popupedit_GkvSearch.Text = e.Data.ToString();
popupedit_GkvSearch.Focus();

2683
Report/DefaultReports/QuittierungsbelegMitDatum.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

106
ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -43,6 +43,7 @@ namespace BeWo.ASBBergischGladbachReports
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.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -72,13 +73,15 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -236,13 +239,14 @@ namespace BeWo.ASBBergischGladbachReports
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.27651522093455744D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -468,9 +472,6 @@ namespace BeWo.ASBBergischGladbachReports
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -478,9 +479,6 @@ namespace BeWo.ASBBergischGladbachReports
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -488,9 +486,6 @@ namespace BeWo.ASBBergischGladbachReports
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -509,11 +504,14 @@ namespace BeWo.ASBBergischGladbachReports
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox2,
this.xrLabel5,
this.xrPictureBox1,
this.xrLabel17,
this.xrLabel11,
this.xrLabel8,
this.xrLabel7,
this.xrLabel6,
this.xrLabel5,
this.xrLabel4,
this.xrLabel3});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
@@ -526,7 +524,7 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel11.BorderWidth = 2;
this.xrLabel11.BorderWidth = 2F;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(420.0001F, 48.20836F);
this.xrLabel11.Name = "xrLabel11";
@@ -555,42 +553,31 @@ namespace BeWo.ASBBergischGladbachReports
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(420F, 162.625F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(333.8749F, 162.625F);
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);
this.xrLabel7.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F);
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Unterschrift Klient/in";
this.xrLabel7.Text = "Datum, Unterschrift Klient/in";
//
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(171F, 162.625F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.625F);
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.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Unterschrift Mitarbeiter/in";
//
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.625F);
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);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Datum";
this.xrLabel6.Text = "Datum, Unterschrift Mitarbeiter/in";
//
// xrLabel4
//
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.BorderWidth = 2;
this.xrLabel4.BorderWidth = 2F;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(420F, 0F);
this.xrLabel4.Name = "xrLabel4";
@@ -635,9 +622,48 @@ namespace BeWo.ASBBergischGladbachReports
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// bindingSource1
// xrPictureBox1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 126.1249F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 126.125F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(120F, 35.5F);
this.xrLabel17.StylePriority.UseBackColor = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(453.8748F, 126.1249F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel5
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(333.8749F, 126.1249F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(120F, 35.5F);
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// Stundenzettel
//
@@ -663,7 +689,7 @@ namespace BeWo.ASBBergischGladbachReports
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -715,13 +741,15 @@ namespace BeWo.ASBBergischGladbachReports
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
}
}

3
ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Collections.Generic;

1
ReportImp/BeWoRichter/BeWoRichter.csproj
View File

@@ -69,6 +69,7 @@
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>

22
ReportImp/BeWoRichter/Service/CustomVacationService.cs Normal file
View File

@@ -0,0 +1,22 @@
using BeWo.Service.Plugins;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWoRichter.Service
{
public class CustomVacationService : VacationService
{
public override List<FeiertagDC> GetFeiertage(int year, String bundesland)
{
var liste = base.GetFeiertage(year, bundesland);
if (year == 2024)
liste.Add(new FeiertagDC() { Datum = new DateTime(2024, 02, 12), Name = "Rosenmontag" }); // Rosenmontag einmaliger Brauchtumstag bei denen
return liste;
}
}
}

136
ReportImp/DiakonischesWerkDinslakenBeWo/QuittierungsbelegMitDatum.Designer.cs generated
View File

@@ -43,8 +43,6 @@ namespace DiakonischesWerkDinslakenBeWo
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -64,9 +62,10 @@ namespace DiakonischesWerkDinslakenBeWo
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell49 = 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.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -125,14 +124,15 @@ namespace DiakonischesWerkDinslakenBeWo
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -287,30 +287,6 @@ namespace DiakonischesWerkDinslakenBeWo
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell44.Weight = 0.20202019104791347D;
//
// xrTableCell50
//
this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.picSignature});
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseBorders = false;
this.xrTableCell50.StylePriority.UseFont = false;
this.xrTableCell50.StylePriority.UsePadding = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell50.Weight = 0.20202019042968572D;
//
// picSignature
//
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.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -581,10 +557,6 @@ namespace DiakonischesWerkDinslakenBeWo
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]";
@@ -607,6 +579,40 @@ namespace DiakonischesWerkDinslakenBeWo
this.ReportHeader.HeightF = 148.75F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel25
//
this.xrLabel25.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(49.36104F, 108.1111F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(130F, 30.5F);
this.xrLabel25.StylePriority.UseBackColor = false;
this.xrLabel25.StylePriority.UseBorders = false;
this.xrLabel25.StylePriority.UseFont = false;
this.xrLabel25.StylePriority.UsePadding = false;
this.xrLabel25.StylePriority.UseTextAlignment = false;
this.xrLabel25.Text = "Verantw. Mitarb.*in";
this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel26
//
this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel26.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(179.3611F, 108.1111F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(199.9999F, 30.50002F);
this.xrLabel26.StylePriority.UseBackColor = false;
this.xrLabel26.StylePriority.UseBorders = false;
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UsePadding = false;
this.xrLabel26.StylePriority.UseTextAlignment = false;
this.xrLabel26.Text = "[MainAttendant]";
this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro;
@@ -993,7 +999,6 @@ namespace DiakonischesWerkDinslakenBeWo
this.xrLabel14.SizeF = new System.Drawing.SizeF(137.3333F, 35.50008F);
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrLabel14.Visible = false;
//
// lblUnterschriftKlient
//
@@ -1344,39 +1349,34 @@ namespace DiakonischesWerkDinslakenBeWo
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// xrLabel25
// bindingSource1
//
this.xrLabel25.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(49.36104F, 108.1111F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(130F, 30.5F);
this.xrLabel25.StylePriority.UseBackColor = false;
this.xrLabel25.StylePriority.UseBorders = false;
this.xrLabel25.StylePriority.UseFont = false;
this.xrLabel25.StylePriority.UsePadding = false;
this.xrLabel25.StylePriority.UseTextAlignment = false;
this.xrLabel25.Text = "Verantw. Mitarb.*in";
this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// xrLabel26
// xrTableCell50
//
this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel26.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(179.3611F, 108.1111F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(199.9999F, 30.50002F);
this.xrLabel26.StylePriority.UseBackColor = false;
this.xrLabel26.StylePriority.UseBorders = false;
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UsePadding = false;
this.xrLabel26.StylePriority.UseTextAlignment = false;
this.xrLabel26.Text = "[MainAttendant]";
this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.picSignature});
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseBorders = false;
this.xrTableCell50.StylePriority.UseFont = false;
this.xrTableCell50.StylePriority.UsePadding = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell50.Weight = 0.20202019042968572D;
//
// picSignature
//
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"),
new DevExpress.XtraReports.UI.XRBinding("Image", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
//
// Quittierungsbeleg2
//
@@ -1404,10 +1404,10 @@ namespace DiakonischesWerkDinslakenBeWo
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1458,7 +1458,6 @@ namespace DiakonischesWerkDinslakenBeWo
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
@@ -1493,7 +1492,6 @@ namespace DiakonischesWerkDinslakenBeWo
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
@@ -1510,5 +1508,7 @@ namespace DiakonischesWerkDinslakenBeWo
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel25;
private DevExpress.XtraReports.UI.XRLabel xrLabel26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
}
}

3
ReportImp/DiakonischesWerkDinslakenBeWo/QuittierungsbelegMitDatum.cs
View File

@@ -36,10 +36,9 @@ namespace DiakonischesWerkDinslakenBeWo
else if (!sd.IsGroup)
sd.Notice5 = "E";
//ServicesOverviewRO.CreateSignatureString(sd);
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
hatGruppen = true;
}
servicesBillable.Add(sd);

71
ReportImp/KetteReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -135,6 +135,10 @@ namespace BeWo.KetteReports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldFreeFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.formattingRuleAbrechenbar = new DevExpress.XtraReports.UI.FormattingRule();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -872,6 +876,10 @@ namespace BeWo.KetteReports
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel27,
this.xrPictureBox1,
this.xrLabel26,
this.xrPictureBox2,
this.xrRichText1,
this.xrLabel10,
this.xrLabel11});
@@ -892,30 +900,30 @@ namespace BeWo.KetteReports
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.99999F);
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(200F, 25F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(275F, 25F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "Unterschrift BezugsbetreuerIn";
this.xrLabel10.Text = "Datum, Unterschrift BezugsbetreuerIn";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel11
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(217F, 33F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(330.0001F, 38.99999F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(200F, 25F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(275F, 25F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Unterschrift KlientIn";
this.xrLabel11.Text = "Datum, Unterschrift KlientIn";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// bindingSource1
@@ -1374,6 +1382,53 @@ namespace BeWo.KetteReports
this.formattingRuleAbrechenbar.Formatting.Visible = DevExpress.Utils.DefaultBoolean.True;
this.formattingRuleAbrechenbar.Name = "formattingRuleAbrechenbar";
//
// xrLabel26
//
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel26.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(330.0001F, 5.499985F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(110F, 33F);
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UseTextAlignment = false;
this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(440.0001F, 5.499985F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(170F, 33F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel27
//
this.xrLabel27.BackColor = System.Drawing.Color.Transparent;
this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5.499991F);
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel27.SizeF = new System.Drawing.SizeF(110F, 33F);
this.xrLabel27.StylePriority.UseBackColor = false;
this.xrLabel27.StylePriority.UseFont = false;
this.xrLabel27.StylePriority.UseTextAlignment = false;
this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrPictureBox1
//
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(110F, 5.499991F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(170F, 33F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1517,5 +1572,9 @@ namespace BeWo.KetteReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
private DevExpress.XtraReports.UI.XRLabel xrLabel26;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

1
ReportImp/MobileEV/MobileEV.csproj
View File

@@ -66,6 +66,7 @@
<Compile Include="Sammelrechnung.Designer.cs">
<DependentUpon>Sammelrechnung.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomSaveInterceptor.cs" />
<Compile Include="TaetigkeitsnachweisAbSept2023.cs">
<SubType>Component</SubType>
</Compile>

41
ReportImp/MobileEV/Service/CustomSaveInterceptor.cs Normal file
View File

@@ -0,0 +1,41 @@
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MobileEV.Service
{
public class CustomSaveInterceptor : SaveInterceptor
{
public override void BeforeSaveServiceRecord(ServiceRecord sr)
{
if (sr.CostBearer2SupportConcept.CostBearer.Organisation.Function != null && !sr.CostBearer2SupportConcept.CostBearer.Organisation.Function.Value.IsNullOrEmpty() && sr.CostBearer2SupportConcept.CostBearer.Organisation.Function.Value == "Rundung Selbstzahler wie LWL")
{
// Nach LWL-Regeln runden
if (sr.DurationMinutes <= 7)
{
sr.RoundedDuration = 0; // Runde auf 0 Minuten, da kleiner als 8
}
else
{
int rest = Convert.ToInt32(sr.DurationMinutes) % 15;
if (rest <= 7)
{
sr.RoundedDuration = Convert.ToInt32(sr.DurationMinutes) - rest; // Abgerundet auf das vorherige Vielfache von 15
}
else
{
sr.RoundedDuration = Convert.ToInt32(sr.DurationMinutes) + (15 - rest); // Auf das nächste Vielfache von 15 aufrunden
}
}
}
}
}
}

2
ReportImp/Nous/CustomReportCreator.cs
View File

@@ -56,7 +56,7 @@ namespace Nous
{
//if (s.IsBillable)
//{
if (s.ServiceCategory.ToLower().Contains("familien"))
if (s.ServiceCategory.ToLower().Contains("familien") || s.ServiceCategory.ToLower().Contains("egh kj") || s.ServiceCategory.ToLower().Contains("inspe") || s.ServiceCategory.ToLower().Contains("flexhilfe"))
{
spfhRo.Services.Add(s);
}

24
ReportImp/SozialeDiensteNiederrhein/Service/CustomVacationService.cs Normal file
View File

@@ -0,0 +1,24 @@
using BeWo.Service.Plugins;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SozialeDiensteNiederrhein.Service
{
public class CustomVacationService : VacationService
{
public override List<FeiertagDC> GetFeiertage(int year, String bundesland)
{
var liste = base.GetFeiertage(year, bundesland);
if (year >= 2024)
liste.Add(new FeiertagDC() { Datum = GetOsterSonntag(year).AddDays(-48), Name = "Rosenmontag"});
return liste;
}
}
}

1
ReportImp/SozialeDiensteNiederrhein/SozialeDiensteNiederrhein.csproj
View File

@@ -87,6 +87,7 @@
<Compile Include="MitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Service\CustomCustomerService.cs" />
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>