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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Christian
2025-07-15 14:26:46 +02:00
parent deed0b081d 69e74b7c88
commit a870512fd7
175 changed files with 9685 additions and 4980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -184,8 +184,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
<Reference Include="log4net, Version=3.1.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.1.0\lib\net462\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -220,9 +220,6 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.2\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -237,13 +234,7 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.2\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web" />
@@ -305,7 +296,7 @@
<Compile Include="Controllers\AbstractBaseController.cs" />
<Compile Include="Controllers\ChatController.cs" />
<Compile Include="Controllers\CustomerController.cs" />
<Compile Include="Controllers\DebuggingToolsController.cs" />
<Compile Include="Controllers\DevToolsController.cs" />
<Compile Include="Controllers\DevExpressSchedulerController.cs" />
<Compile Include="Controllers\ExternalSignatureController.cs" />
<Compile Include="Controllers\ReportBaseController.cs" />
@@ -323,7 +314,7 @@
<Compile Include="Models\ReportViewerSessionModel.cs" />
<Compile Include="Models\CustomerSessionModel.cs" />
<Compile Include="Models\CustomerModel.cs" />
<Compile Include="Models\DebuggingToolsModel.cs" />
<Compile Include="Models\DevToolsModel.cs" />
<Compile Include="Models\DevExpressSchedulerModel.cs" />
<Compile Include="Models\ExternalSignatureModel.cs" />
<Compile Include="Models\ISessionModel.cs" />
@@ -673,10 +664,10 @@
<Content Include="Views\ReportViewer\BerichteFormPartialView.cshtml" />
<Content Include="Scripts\moment.min.js.map" />
<Content Include="Scripts\moment-with-locales.min.js.map" />
<Content Include="Views\DebuggingTools\DebuggingTools.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsSettingsPartial.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsUserRightsPartial.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsDataGenerationPartial.cshtml" />
<Content Include="Views\DevTools\DevTools.cshtml" />
<Content Include="Views\DevTools\DevToolsSettingsPartial.cshtml" />
<Content Include="Views\DevTools\DevToolsUserRightsPartial.cshtml" />
<Content Include="Views\DevTools\DevToolsDataGenerationPartial.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
@@ -765,7 +756,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>

23
BeWoPlanerMobil/Controllers/DebuggingToolsController.cs → BeWoPlanerMobil/Controllers/DevToolsController.cs
View File

@@ -1,13 +1,15 @@
using System.Web.Mvc;
using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
using Bogus;
using BS.Shared.DataContracts;
namespace BeWoPlanerMobil.Controllers
{
public class DebuggingToolsController : AbstractBaseController
public class DevToolsController : AbstractBaseController
{
private DebuggingToolsModel _Model;
public DebuggingToolsModel Model
private DevToolsModel _Model;
public DevToolsModel Model
{
get
{
@@ -19,7 +21,7 @@ namespace BeWoPlanerMobil.Controllers
if(_Model is null)
{
_Model = new DebuggingToolsModel();
_Model = new DevToolsModel();
InitModel(_Model);
}
@@ -28,7 +30,7 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public ActionResult DebuggingTools()
public ActionResult DevTools()
{
if(!MobileSessionFacade.IsUserLoggedIn() || Model is null)
{
@@ -65,5 +67,16 @@ namespace BeWoPlanerMobil.Controllers
return LeerzeichenFuerGetMethoden;
}
private Faker<AddressDC> _AddressFaker = new Faker<AddressDC>("de");
[Authorize]
[HttpPost]
public ActionResult GenerateDemoData()
{
return PartialView("DevToolsDataGenerationPartial", Model);
}
}
}

2
BeWoPlanerMobil/Models/DebuggingToolsModel.cs → BeWoPlanerMobil/Models/DevToolsModel.cs
View File

@@ -6,7 +6,7 @@ using BS.Shared.Extensions;
namespace BeWoPlanerMobil.Models
{
public class DebuggingToolsModel : AbstractModel
public class DevToolsModel : AbstractModel
{
// Rechtegruppen
// Benutzer

8
BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
View File

@@ -42,10 +42,10 @@ namespace BeWoPlanerMobil.Service
if(!SessionFactories.ContainsKey(MobileSessionFacade.Tenant))
{
#if DEBUG
//var hierarchy = (Hierarchy) LogManager.GetRepository();
//var logger = (Logger) hierarchy.GetLogger("NHibernate.SQL");
//logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
//hierarchy.Configured = true;
var hierarchy = (Hierarchy)LogManager.GetRepository();
var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
hierarchy.Configured = true;
#endif
var serverPath = HttpContext.Current.Server.MapPath(null);

2
BeWoPlanerMobil/Util/FormCollectionConstants.cs
View File

@@ -65,7 +65,7 @@
// public static string DevelopmentModelKey => "DevelopmentModel";
// public static string DevExpressReportModelKey => "DevExpressReportModel";
// public static string ReportViewerModelKey => "ReportViewerModel";
// public static string DebuggingToolsModelKey => "DebuggingToolsModel";
// public static string DebuggingToolsModelKey => "DevToolsModel";
//}
public class TempDataConstants

2
BeWoPlanerMobil/Views/DebuggingTools/DebuggingTools.cshtml → BeWoPlanerMobil/Views/DevTools/DevTools.cshtml
View File

@@ -1,5 +1,5 @@
@using BeWoPlanerMobil.Util
@model BeWoPlanerMobil.Models.DebuggingToolsModel
@model BeWoPlanerMobil.Models.DevToolsModel
@{
if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)

2
BeWoPlanerMobil/Views/DebuggingTools/DevToolsDataGenerationPartial.cshtml → BeWoPlanerMobil/Views/DevTools/DevToolsDataGenerationPartial.cshtml
View File

@@ -1,7 +1,7 @@
@using BeWoPlanerMobil.Models
@using BeWoPlanerMobil.Util
@using BS.Shared
@model DebuggingToolsModel
@model DevToolsModel
<h1 class="text-info font-weight-bold">
Hier kann man bald Daten zum Testen generieren ...

2
BeWoPlanerMobil/Views/DebuggingTools/DevToolsSettingsPartial.cshtml → BeWoPlanerMobil/Views/DevTools/DevToolsSettingsPartial.cshtml
View File

@@ -1,6 +1,6 @@
@using BeWoPlanerMobil.Models
@using BeWoPlanerMobil.Util
@model DebuggingToolsModel
@model DevToolsModel
<script type="text/javascript">
function onBoolSettingChange(input) {

2
BeWoPlanerMobil/Views/DebuggingTools/DevToolsUserRightsPartial.cshtml → BeWoPlanerMobil/Views/DevTools/DevToolsUserRightsPartial.cshtml
View File

@@ -1,5 +1,5 @@
@using BeWoPlanerMobil.Models
@using BeWoPlanerMobil.Util
@using BS.Shared
@model DebuggingToolsModel
@model DevToolsModel

32
BeWoPlanerMobil/Web.config
View File

@@ -297,43 +297,55 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

8
BeWoPlanerMobil/packages.config
View File

@@ -8,7 +8,7 @@
<package id="jQuery" version="3.7.1" targetFramework="net472" />
<package id="jQuery.UI.Combined" version="1.14.1" targetFramework="net472" />
<package id="jQuery.Validation" version="1.21.0" targetFramework="net472" />
<package id="log4net" version="3.0.4" targetFramework="net472" />
<package id="log4net" version="3.1.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.3.0" targetFramework="net472" />
@@ -34,9 +34,9 @@
<package id="Newtonsoft.Json.Bson" version="1.0.3" targetFramework="net472" />
<package id="RestSharp" version="106.13.0" targetFramework="net472" />
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
<package id="System.Memory" version="4.6.2" targetFramework="net472" />
<package id="System.Memory" version="4.6.3" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.6.2" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
<package id="WebGrease" version="1.6.0" targetFramework="net472" />
</packages>