This commit is contained in:
2024-02-07 15:58:56 +01:00
parent 9ac830f590
commit d7dfab0ac4
7 changed files with 28 additions and 31 deletions

View File

@@ -43,8 +43,8 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64

View File

@@ -47,7 +47,8 @@
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>AVISO.xml</DocumentationFile> <DocumentationFile>AVISO.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn> <NoWarn>
</NoWarn>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -58,7 +59,8 @@
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DocumentationFile>AVISO.xml</DocumentationFile> <DocumentationFile>AVISO.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn> <NoWarn>
</NoWarn>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@@ -111,7 +113,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>Aviso_1_TemporaryKey.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
@@ -126,9 +128,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath> <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
</Reference> </Reference>
<Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64"> <Reference Include="ChilkatDotNet47">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
<HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
</Reference> </Reference>
<Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@@ -337,10 +338,6 @@
<Reference Include="ThoughtWorks.QRCode"> <Reference Include="ThoughtWorks.QRCode">
<HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath> <HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
</Reference> </Reference>
<Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -1396,17 +1393,14 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="AL20210908.pfx" /> <None Include="AL20231110.pfx" />
<None Include="App.config" /> <None Include="App.config" />
<None Include="Aviso_1_TemporaryKey.pfx" />
<None Include="Aviso_TemporaryKey.pfx" />
<None Include="Dokumentenbeschriftung\PageReport1.rdlx"> <None Include="Dokumentenbeschriftung\PageReport1.rdlx">
<SubType>Component</SubType> <SubType>Component</SubType>
</None> </None>
<None Include="GenerelleGestellungenVorlagen\GenerelleGestellung_DE.pdf"> <None Include="GenerelleGestellungenVorlagen\GenerelleGestellung_DE.pdf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="LME.pfx" />
<None Include="My Project\app.manifest" /> <None Include="My Project\app.manifest" />
<None Include="My Project\Application.myapp"> <None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator> <Generator>MyApplicationCodeGenerator</Generator>
@@ -1418,6 +1412,7 @@
<CustomToolNamespace>My</CustomToolNamespace> <CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput> <LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None> </None>
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
<None Include="Resources\Flender_Bocholt.xlsx" /> <None Include="Resources\Flender_Bocholt.xlsx" />
<None Include="Resources\ATANAK_Instructions_Export.xlsx"> <None Include="Resources\ATANAK_Instructions_Export.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -1470,6 +1465,11 @@
<Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project> <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
<Name>SDL</Name> <Name>SDL</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
<Private>True</Private>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client"> <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.9.6.2")> <Assembly: AssemblyVersion("3.9.7.0")>
<Assembly: AssemblyFileVersion("3.9.6.2")> <Assembly: AssemblyFileVersion("3.9.7.0")>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase

View File

@@ -1,10 +1,6 @@
Imports System.IO Imports System.IO
Imports System.Windows.Forms
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Imports System.Reflection
Imports System.DirectoryServices
Imports Therefore.API
Public Class frmLogin Public Class frmLogin
@@ -15,7 +11,7 @@ Public Class frmLogin
Private ADMIN As New cADMIN Private ADMIN As New cADMIN
Public firma As String = "VERAG" Public firma As String = "VERAG"
Dim SECRET = False Dim SECRET As Boolean = False
Public Sub New() Public Sub New()
InitializeComponent() InitializeComponent()
Icon = cMeineFunktionenAVISO.GetProgrammIcon Icon = cMeineFunktionenAVISO.GetProgrammIcon

View File

@@ -1318,6 +1318,7 @@ Partial Class usrcntlAktDetails
'Panel8 'Panel8
' '
Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel8.Controls.Add(Me.lblAktUebernommen)
Me.Panel8.Controls.Add(Me.lblLKWChat_MsgCnt) Me.Panel8.Controls.Add(Me.lblLKWChat_MsgCnt)
Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme) Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme)
Me.Panel8.Controls.Add(Me.picAVISOMessenger) Me.Panel8.Controls.Add(Me.picAVISOMessenger)
@@ -1339,7 +1340,6 @@ Partial Class usrcntlAktDetails
Me.Panel8.Controls.Add(Me.pnlAbgeschlossen) Me.Panel8.Controls.Add(Me.pnlAbgeschlossen)
Me.Panel8.Controls.Add(Me.lklAuswahlAufheben) Me.Panel8.Controls.Add(Me.lklAuswahlAufheben)
Me.Panel8.Controls.Add(Me.txtLKWID) Me.Panel8.Controls.Add(Me.txtLKWID)
Me.Panel8.Controls.Add(Me.lblAktUebernommen)
Me.Panel8.Dock = System.Windows.Forms.DockStyle.Top Me.Panel8.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel8.Location = New System.Drawing.Point(0, 0) Me.Panel8.Location = New System.Drawing.Point(0, 0)
Me.Panel8.Name = "Panel8" Me.Panel8.Name = "Panel8"
@@ -1609,8 +1609,8 @@ Partial Class usrcntlAktDetails
'pnlAbgeschlossen 'pnlAbgeschlossen
' '
Me.pnlAbgeschlossen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlAbgeschlossen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.pnlAbgeschlossen.Controls.Add(Me.Label2)
Me.pnlAbgeschlossen.Controls.Add(Me.pic) Me.pnlAbgeschlossen.Controls.Add(Me.pic)
Me.pnlAbgeschlossen.Controls.Add(Me.Label2)
Me.pnlAbgeschlossen.Location = New System.Drawing.Point(413, 75) Me.pnlAbgeschlossen.Location = New System.Drawing.Point(413, 75)
Me.pnlAbgeschlossen.Name = "pnlAbgeschlossen" Me.pnlAbgeschlossen.Name = "pnlAbgeschlossen"
Me.pnlAbgeschlossen.Size = New System.Drawing.Size(157, 44) Me.pnlAbgeschlossen.Size = New System.Drawing.Size(157, 44)

View File

@@ -92,7 +92,7 @@
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>Gemeinsames_TemporaryKey.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
@@ -129,6 +129,10 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -252,6 +256,7 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
<None Include="Resources\Versionsinfo.txt" /> <None Include="Resources\Versionsinfo.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -309,10 +314,6 @@
<Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project> <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
<Name>DAKOSY_Worker_lib</Name> <Name>DAKOSY_Worker_lib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.