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-09-20 13:36:12 +02:00
parent 0c36eac7e6 616c3fd62d
commit 3d79202c4e
6 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
View File

@@ -73,6 +73,7 @@
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="CustomVacationService.cs" />
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>

10
ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -158,5 +158,13 @@ namespace BeWo.BeWoAuxilio
emp.Custom1 += (duration / 60);
}
}
}
public override bool IstAnrechenbareAbsenceTime(AbsenceTime item)
{
if (item.AbsenceReason.Description != null && item.AbsenceReason.Description.ToLower().Contains("freizeitausgleich"))
return false;
else
return base.IstAnrechenbareAbsenceTime(item);
}
}
}

29
ReportImp/BeWoAuxilio/CustomVacationService.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using BeWo.Service.Core;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Utils = BS.Shared.Core.Utils;
namespace BeWoAuxilio.Service
{
public class CustomVacationService : VacationService
{
public override List<FeiertagDC> GetFeiertage(int year, string bundesland)
{
var list = base.GetFeiertage(year, bundesland);
list.Add(new FeiertagDC() { Datum = new DateTime(year, 12, 31), Name = "Silvester" });
return list;
}
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Date.Month == 12 && (start.Date.Day == 24 || start.Date.Day == 31))
return 0.5m;
else
return base.GetFeiertagsFaktor(start);
}
}
}

14
ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs
View File

@@ -21,6 +21,20 @@ namespace BeWo.BeWoAuxilio
var msb = new CustomMitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
foreach (var emp in pRO.EmployeeDetailList)
{
if (emp.SollProTag != 0)
{
var urlaubKrankheit = 0m;
if (emp.TageUrlaub.HasValue)
urlaubKrankheit += emp.TageUrlaub.Value * emp.SollProTag;
if (emp.TageKrankheit.HasValue)
urlaubKrankheit += emp.TageKrankheit.Value * emp.SollProTag;
emp.UrlaubUndKrankheit = urlaubKrankheit;
}
}
this.bindingSource1.DataSource = pRO;
}

1
ReportImp/BetreutesWohnenWoellReports/Properties/licenses.licx
View File

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

34
ReportImp/BetreutesWohnenWoellReports/SettlementReport2.cs
View File

@@ -6,6 +6,7 @@ using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Extensions;
using System.Linq;
namespace BeWo.BetreutesWohnenWoellReports
{
@@ -19,15 +20,34 @@ namespace BeWo.BetreutesWohnenWoellReports
public void SetReportDataSource(Settlement2RO pRO)
{
decimal rateFactor = 1;
bool assistenzRechnung = false;
bool assistenzRechnung = false;
foreach (var ii in pRO.InvoiceItems)
if (pRO.InvoiceItems.Any(ii => ii.RateFactor.HasValue))
{
if (pRO.InvoiceItems.Any(ii => ii.RateFactor.Value == 20))
{
rateFactor = 1.2m;
pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
}
else if (pRO.InvoiceItems.Any(ii => ii.RateFactor.Value == 0))
{
rateFactor = 1m;
pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
}
}
else
{
rateFactor = 1m;
pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
}
foreach (var ii in pRO.InvoiceItems)
{
if (ii.RateFactor.HasValue)
{
rateFactor = (100 + ii.RateFactor.Value) / 100;
pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
}
//if (ii.RateFactor.HasValue)
//{
// rateFactor = (100 + ii.RateFactor.Value) / 100;
// pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
//}
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
{