Fat-Client:
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:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user