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

MH: Anpassung für Ilka Link Ivi

Browse Source
This commit is contained in:
Marcel Hirschle
2022-03-22 11:36:48 +01:00
parent 1c1f382479
commit 8a94a3068b
9 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BeWo.sln
View File

@@ -513,6 +513,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LeWoAachen", "ReportImp\LeW
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToprakGmbH", "ReportImp\ToprakGmbH\ToprakGmbH.csproj", "{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlzeyTeilhabe", "ReportImp\AlzeyTeilhabe\AlzeyTeilhabe.csproj", "{D173B437-EAD2-4535-B59D-76737600E058}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4004,6 +4006,22 @@ Global
{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.ActiveCfg = Release|Any CPU
{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.Build.0 = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.ActiveCfg = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.Build.0 = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|x86.ActiveCfg = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Debug|x86.Build.0 = Debug|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|.NET.ActiveCfg = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|.NET.Build.0 = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|Any CPU.Build.0 = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|x86.ActiveCfg = Release|Any CPU
{D173B437-EAD2-4535-B59D-76737600E058}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4256,6 +4274,7 @@ Global
{54419AAB-93DB-482F-B304-035D001081DD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D173B437-EAD2-4535-B59D-76737600E058} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

22
Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt Normal file
View File

@@ -0,0 +1,22 @@
CREATE TABLE `abwesenheitsinformationprint` (
`Oid` bigint NOT NULL AUTO_INCREMENT,
`Tid` int NOT NULL,
`ObjectOid` bigint DEFAULT NULL,
`ObjectTid` int DEFAULT NULL,
`Notice` varchar(1024) DEFAULT NULL,
`InsTs` datetime DEFAULT NULL,
`InsUser` varchar(256) DEFAULT NULL,
`Version` bigint DEFAULT NULL,
`UdpUser` varchar(256) DEFAULT NULL,
`IsActive` tinyint DEFAULT NULL,
`SystemEntryID` int DEFAULT NULL,
`Employee` varchar(256) DEFAULT NULL,
`ResturlaubVorjahr` varchar(256) DEFAULT NULL,
`VerfallenerResturlaub` varchar(256) DEFAULT NULL,
`Urlaubsanspruch` varchar(256) DEFAULT NULL,
`Resturlaub` varchar(256) DEFAULT NULL,
`TageKrankheit` varchar(256) DEFAULT NULL,
`TageUrlaub` varchar(256) DEFAULT NULL,
`GeschenkteUrlaubstage` varchar(256) DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

10
ReportImp/BeWoRueckenwind/Invoicing/BeWoRueckenwindAssistenzInvoiceCreation.cs
View File

@@ -20,10 +20,10 @@ namespace BeWoRueckenwind.Invoicing
}
//public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
// Calculations calc)
//{
// return itemList;
//}
//public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
// Calculations calc)
//{
// return itemList;
//}
}
}

2
ReportImp/IlkaLinkAmbulanteHilfen/IlkaLinkAmbulanteHilfen.csproj
View File

@@ -66,6 +66,8 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\IlkaLinkAmbulanteHilfenInvoiceCreation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>

20
ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/CustomInvoiceFactory.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace IlkaLinkAmbulanteHilfen.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
return new IlkaLinkAmbulanteHilfenInvoiceCreation();
}
}
}

22
ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/IlkaLinkAmbulanteHilfenInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
namespace IlkaLinkAmbulanteHilfen.Invoicing
{
public class IlkaLinkAmbulanteHilfenInvoiceCreation : InvoiceCreation
{
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
return itemList;
}
}
}

8
ReportImp/IlkaLinkAmbulanteHilfen/Reporting/CustomReportCreator.cs
View File

@@ -29,10 +29,10 @@ namespace IlkaLinkAmbulanteHilfen.Reporting
{
var os = new OperationsServiceImp();
var m = os.GetMandator2(false);
if (m.AllowSbd)
{
return CreateSbdLeistungsnachweisForAllCustomers(month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay);
}
//if (m.AllowSbd)
//{
// return CreateSbdLeistungsnachweisForAllCustomers(month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay);
//}
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid, true, nurFehlende);

4
ReportImp/IlkaLinkAmbulanteHilfen/ServiceInvoiceReport.Designer.cs generated
View File

@@ -787,8 +787,8 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(1140F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(394F, 70F);
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 5, 5, 254F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(390F, 70F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UsePadding = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;

4
Service/Plugins/PluginLoader.cs
View File

@@ -310,7 +310,7 @@ namespace BeWo.Service.Plugins
//t = "1344064965"; // ABW Klaßen
//t = "3625103678"; // Pro Hilfe GbR | MID
//t = "6028314513"; // Grundstein e.V.
//t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung &amp; Therapie
t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung &amp; Therapie
//t = "9416221963"; // Übergangshilfe Unna e.V.
//t = "1316958991"; // Aidshilfe Essen
//t = "3718732195"; // Diakonie Remscheid Lennep (Jobfit)
@@ -324,7 +324,7 @@ namespace BeWo.Service.Plugins
//t = "4293131072"; // ASB Rhein-Erft/Düren e.V. Schulbegleitung
//t = "2221228727"; // Autismus Leben gGmbH
//t = "5065709552"; // Biotop e.V.
t = "9094672461"; // Toprak GmbH
//t = "9094672461"; // Toprak GmbH
return t;
#else