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

Fat-Client:

Browse Source 
Es ist möglich, allen Termin-Einladungen auf einmal zuzusagen

MoK:
DevExpress von Version 17.1 auf 21.1 aktualisiert
Reports testweise eingebaut
DevExpress-Scheduler testweise eingebaut
This commit is contained in:
Lyndon Jetten
2021-10-13 16:00:33 +02:00
parent 365027afc9
commit 5939aef72c
660 changed files with 64264 additions and 11126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReportService/ServiceContracts/IReportService.cs
View File

@@ -67,5 +67,13 @@ namespace ReportingService.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateKilometerauswertungForAllCustomersForWebVersion(List<long> customerOids, DateTime rangeDate, string tenant);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateMedikamentenlistenReport(long mvlOid, string tenant);
}
}

68
ReportService/ServiceImplementations/ReportServiceImp.cs
View File

@@ -157,6 +157,7 @@ namespace ReportingService.ServiceImplementations
private static AbstractReportCreator GetReportCreator()
{
var derTenant = MultitenancyOperationContextExt.Current.Tenant;
AbstractReportCreator creator = null;
#if DEBUG
//Kundennummern zum Testen nur noch in PluginLoader eintragen:
@@ -195,7 +196,53 @@ namespace ReportingService.ServiceImplementations
return creator;
}
private static BeWoEntityBase LoadToBargeldkasseRelatedObject(TableID pObjectTid, long pObjectOid)
private static AbstractReportCreator GetReportCreator(string tenant)
{
AbstractReportCreator creator = null;
#if DEBUG
//Kundennummern zum Testen nur noch in PluginLoader eintragen:
tenant = PluginLoader.Tenant;
// Ist "C:\Users\lyndo\BeWo\BeWoPlanerMobil\bin\2387527289_reports.dll"
// statt "C:\Users\lyndo\BeWo\Host\bin\2387527289_reports.dll"
var path = @"..\Host\";
var customerDllPath = Path.Combine(path, @"bin\" + tenant + "_reports.dll");// Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"bin\" + tenant + "_reports.dll");
#else
var customerDllPath = Path.Combine(path, @"bin\" + tenant + "_reports.dll");//Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Customer\" + tenant + "_reports.dll");
#endif
if (File.Exists(customerDllPath))
{
var allTypes = Assembly.LoadFrom(customerDllPath).GetTypes();
var reportCreator = allTypes.FirstOrDefault(i => typeof(AbstractReportCreator).IsAssignableFrom(i));
if (reportCreator != null)
{
creator = Activator.CreateInstance(reportCreator) as AbstractReportCreator;
}
}
if (creator == null)
{
creator = new DefaultReportCreator();
}
creator.Tenant = tenant;
creator.ReportPath = customerDllPath;
#if DEBUG
creator.TempPath = Path.Combine(path, @"demo\temp");
#else
creator.TempPath = Path.Combine(path, tenant + @"\temp");
#endif
return creator;
}
private static BeWoEntityBase LoadToBargeldkasseRelatedObject(TableID pObjectTid, long pObjectOid)
{
switch (pObjectTid)
{
@@ -246,5 +293,24 @@ namespace ReportingService.ServiceImplementations
return report == null ? null : CreateReportStream(report);
}
// Zum Test im MoK
public MemoryStream CreateKilometerauswertungForAllCustomersForWebVersion(List<long> customerOids, DateTime rangeDate, string tenant)
{
var reportCreator = GetReportCreator(tenant);
var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, rangeDate);
return report == null ? null : CreateReportStream(report);
}
public MemoryStream CreateMedikamentenlistenReport(long mvlOid, string tenant)
{
var reportCreator = GetReportCreator(tenant);
var report = reportCreator.CreateMediVerordListenReport(mvlOid);
return report == null ? null : CreateReportStream(report);
}
}
}

8
ReportService/app.config
View File

@@ -6,6 +6,14 @@
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>