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

PSM Einzelunterschrift hinzugefügt. Die hatte gefehlt.

Browse Source 
ServicesOverviewRO hat jetzt eine Bitmap-Einzelunterschrift. Damit kann man die Bitmap einfach an die PictureBox binden.

Pfad in MoK web.config angepasst für CustomerDlls, damit da die angepassten Berichte angezeigt werden.
This commit is contained in:
Lyndon Jetten
2023-12-07 14:54:26 +01:00
parent cce96e87da
commit bf2411b5a3
9 changed files with 162 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web.Mvc;
using BeWo.Report;
@@ -285,12 +286,13 @@ namespace BeWoPlanerMobil.Controllers
private static AbstractReportCreator GetReportCreator()
{
var creator = PluginLoader.FindClass<DefaultReportCreator>();
AbstractReportCreator creator = PluginLoader.FindClass<DefaultReportCreator>() ?? new DefaultReportCreator();
var mobileBaseDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\Host\");
#if DEBUG
creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"demo\temp");
creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(mobileBaseDirectory, @"demo\temp");
#else
creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, PluginLoader.Tenant + @"\temp");
creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(mobileBaseDirectory, PluginLoader.Tenant + @"\temp");
#endif
return creator;
}

4
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -599,7 +599,7 @@
var test = $.parseJSON(data);
});
} catch (error) {
showErrorPopup(error);
}
}
</text>
@@ -611,7 +611,7 @@
{
<text>
<div class="row">
<div class="col-md">
<div class="col w-100 m-3">
<button class="btn btn-bewo-dev" type="button" onclick="provokeJsonError()">JSON-Fehler provozieren</button>
</div>
</div>

6
BeWoPlanerMobil/Web.config
View File

@@ -147,10 +147,8 @@
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
<add key="ContractStateUrl" value="https://support.bewoplaner.de/api/getcontractstate.php?CustomerID=[TENANT]" />
<!--<add key="PluginPathtest" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\bin" />-->
<!-- Lyndon -->
<!--<add key="PluginPath" value="C:\Users\lyndo\BeWo\Host\bin" />-->
<add key="PluginPath" value="..\Host\bin" />
<!-- /Lyndon -->
<add key="PluginBasePath" value="..\CustomerDlls" />
<add key="PluginPath" value="..\CustomerDlls" />
<add key="FileRootDirectory" value="\BWP-Files" />
</appSettings>
<!--