AidshilfeEssen Erweiterung auf SR2
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27004.2009
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.31424.327
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
|
||||
EndProject
|
||||
@@ -29,6 +29,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportS
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{571F2E51-6808-459B-B2B8-7882691A26AF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamPfeil", "ReportImp\TeamPfeil\TeamPfeil.csproj", "{B0C86A71-94ED-4F0D-98B3-49DB04056882}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|.NET = Debug|.NET
|
||||
@@ -139,6 +143,18 @@ Global
|
||||
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|.NET.Build.0 = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|.NET.Build.0 = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -152,6 +168,7 @@ Global
|
||||
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
|
||||
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
|
||||
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
|
||||
{B0C86A71-94ED-4F0D-98B3-49DB04056882} = {571F2E51-6808-459B-B2B8-7882691A26AF}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}
|
||||
|
||||
@@ -64,6 +64,12 @@
|
||||
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Service\ServiceRecordDurationCalculator.cs" />
|
||||
<Compile Include="SettlementReport2.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SettlementReport2.Designer.cs">
|
||||
<DependentUpon>SettlementReport2.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SettlementReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -99,6 +105,10 @@
|
||||
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="SettlementReport2.resx">
|
||||
<DependentUpon>SettlementReport2.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="SettlementReport.resx">
|
||||
<DependentUpon>SettlementReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
@@ -87,7 +87,7 @@ namespace AidshilfeEssen.Alt
|
||||
tc_BewilligtGesamt.Text = string.Format("{0:0.00}", pRO.ApprovedFLSWeekly * (decimal)wochen);
|
||||
lblMaxZuLeistendeStunden.Text = string.Format("{0:0.00}", pRO.ApprovedFLSWeekly * (decimal)wochen);
|
||||
|
||||
lblAnspruchAbzglEigenanteil.Text = string.Format("{0:0.00€}", pRO.AmountRecordedFLS - pRO.Eigenbeteiligung.Value);
|
||||
lblAnspruchAbzglEigenanteil.Text = string.Format("{0:0.00 €}", pRO.AmountRecordedFLS - pRO.Eigenbeteiligung.Value);
|
||||
lblBetragFuerKostentraeger.Text = lblAnspruchAbzglEigenanteil.Text;
|
||||
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
|
||||
1490
ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs
generated
Normal file
1490
ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
80
ReportImp/AidshilfeEssen/SettlementReport2.cs
Normal file
80
ReportImp/AidshilfeEssen/SettlementReport2.cs
Normal file
@@ -0,0 +1,80 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.RegularExpressions;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
|
||||
namespace AidshilfeEssen
|
||||
{
|
||||
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
|
||||
{
|
||||
public Spitzabrechnung()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void SetReportDataSource(Settlement2RO pRO)
|
||||
{
|
||||
bool isDefaultSpitzabrechnung = false;
|
||||
|
||||
//if (String.IsNullOrEmpty(pRO.Notice))
|
||||
//{
|
||||
// lblNotice.Visible = false;
|
||||
//}
|
||||
|
||||
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
|
||||
{
|
||||
var ii = pRO.InvoiceItems[0];
|
||||
if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
|
||||
{
|
||||
isDefaultSpitzabrechnung = true;
|
||||
}
|
||||
}
|
||||
|
||||
decimal rateFactor = 1;
|
||||
|
||||
foreach (var ii in pRO.InvoiceItems)
|
||||
{
|
||||
if (ii.RateFactor.HasValue)
|
||||
{
|
||||
rateFactor = (100 + ii.RateFactor.Value) / 100;
|
||||
}
|
||||
|
||||
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
|
||||
{
|
||||
Zwischensumme.Visible = true;
|
||||
if (!ii.ItemDescription.IsNullOrEmpty())
|
||||
{
|
||||
ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
|
||||
}
|
||||
ii.ItemDescription = "Fehlkontakte";
|
||||
}
|
||||
}
|
||||
pRO.RateFactor = (double)rateFactor;
|
||||
|
||||
var tage = (pRO.AccountingEndDate - pRO.AccountingStartDate).TotalDays;
|
||||
var wochen = tage / 7;
|
||||
tc_TageBewilligt.Text = tage.ToString();
|
||||
tc_WochenBewilligt.Text = string.Format("{0:0.00}", wochen);
|
||||
tc_BewilligtProWoche.Text = pRO.ApprovedFLSWeekly.ToString();
|
||||
tc_BewilligtGesamt.Text = string.Format("{0:0.00}", pRO.ApprovedFLSWeekly * (decimal)wochen);
|
||||
lblMaxZuLeistendeStunden.Text = string.Format("{0:0.00}", pRO.ApprovedFLSWeekly * (decimal)wochen);
|
||||
|
||||
lblAnspruchAbzglEigenanteil.Text = string.Format("{0:c2}", pRO.AmountBillableTotal - pRO.Eigenbeteiligung.Value);
|
||||
lblBetragFuerKostentraeger.Text = lblAnspruchAbzglEigenanteil.Text;
|
||||
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
private String GetCustomerId(SettlementRO pRO)
|
||||
{
|
||||
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
|
||||
return cb2sc.CostBearer.ID;
|
||||
}
|
||||
}
|
||||
}
|
||||
2202
ReportImp/AidshilfeEssen/SettlementReport2.resx
Normal file
2202
ReportImp/AidshilfeEssen/SettlementReport2.resx
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user