Merge-Commit

This commit is contained in:
2025-10-09 12:56:32 +02:00
105 changed files with 5560 additions and 2267 deletions

View File

@@ -24,7 +24,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<TargetFrameworkProfile />
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>4.3</TypeScriptToolsVersion>
@@ -74,6 +74,7 @@
<TypeScriptSourceMap>True</TypeScriptSourceMap>
<TypeScriptMapRoot />
<TypeScriptSourceRoot />
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -316,6 +317,7 @@
<Compile Include="Models\MokSupportConceptListObject.cs" />
<Compile Include="Models\MokMandator.cs" />
<Compile Include="Models\MokServiceRecord.cs" />
<Compile Include="Models\BaseSessionModel.cs" />
<Compile Include="Models\SchedulerSessionModel.cs" />
<Compile Include="Models\MainSessionModel.cs" />
<Compile Include="Models\ReportSessionModel .cs" />
@@ -325,7 +327,6 @@
<Compile Include="Models\DevToolsModel.cs" />
<Compile Include="Models\DevExpressSchedulerModel.cs" />
<Compile Include="Models\ExternalSignatureModel.cs" />
<Compile Include="Models\ISessionModel.cs" />
<Compile Include="Models\ReportModel.cs" />
<Compile Include="Models\ReportViewerModel.cs" />
<Compile Include="Models\SchedulerModel.cs" />
@@ -588,6 +589,7 @@
<Content Include="Scripts\moment\moment.js" />
<Content Include="Scripts\moment\moment.min.js" />
<Content Include="Scripts\ownSoft-Scripts\signature.js" />
<Content Include="Scripts\ownSoft-Scripts\utils\countdown.js" />
<Content Include="Scripts\ownSoft-Scripts\utils\dropdown-search.js" />
<Content Include="Scripts\signature-pad.min.js" />
<Content Include="Scripts\tempusdominus-boostrap-4.min.js" />
@@ -677,6 +679,7 @@
<Content Include="Views\DevTools\DevToolsDataGenerationPartial.cshtml" />
<Content Include="Views\Main\RestoreServiceRecordInputsPartial.cshtml" />
<Content Include="Scripts\bs-custom-file-input.min.js.map" />
<Content Include="Views\Main\Zeiterfassungspartial.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />