Compare commits

...

2 Commits

Author SHA1 Message Date
Stefan Hutter
220e5ff9cf update 20241211 2024-12-11 22:24:49 +01:00
Stefan Hutter
2c42687a40 update 20241210 2024-12-10 20:36:02 +01:00
264 changed files with 73541 additions and 1097 deletions

85
ADDemo/ADDemo.csproj Normal file
View File

@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{16CA57CE-B430-4B04-B9BE-7E4FF909C7A6}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>ADDemo</RootNamespace>
<AssemblyName>ADDemo</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.DirectoryServices.Protocols" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

6
ADDemo/App.config Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>

61
ADDemo/Form1.Designer.cs generated Normal file
View File

@@ -0,0 +1,61 @@
namespace ADDemo
{
partial class Form1
{
/// <summary>
/// Erforderliche Designervariable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Verwendete Ressourcen bereinigen.
/// </summary>
/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Vom Windows Form-Designer generierter Code
/// <summary>
/// Erforderliche Methode für die Designerunterstützung.
/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
/// </summary>
private void InitializeComponent()
{
this.button1 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(43, 28);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 0;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.button1);
this.Name = "Form1";
this.Text = "Form1";
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button button1;
}
}

148
ADDemo/Form1.cs Normal file
View File

@@ -0,0 +1,148 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.SqlClient;
using System.DirectoryServices;
using System.DirectoryServices.Protocols;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ADDemo
{
public partial class Form1 : Form
{
string Username = "";
string ADError = "";
public Form1()
{
InitializeComponent();
}
private void button1_Click(object sender, EventArgs e)
{
DirectoryEntry de = new DirectoryEntry();
Get_User("meyering", ref de);
}
public class UserData
{
public string Name { get; set; } = "";
public string Department { get; set; } = "";
public string Office { get; set; }
}
private void trylogin()
{
try
{
LdapConnection connection = new LdapConnection("ldap.fabrikam.com");
NetworkCredential credential = new NetworkCredential("user", "password");
connection.Credential = credential;
connection.Bind();
Console.WriteLine("logged in");
}
catch (LdapException lexc)
{
String error = lexc.ServerErrorMessage;
Console.WriteLine(lexc);
}
catch (Exception exc)
{
Console.WriteLine(exc);
}
//---------------------------
using (DirectoryEntry adsEntry = new DirectoryEntry(path, strAccountId, strPassword))
{
using (DirectorySearcher adsSearcher = new DirectorySearcher(adsEntry))
{
//adsSearcher.Filter = "(&(objectClass=user)(objectCategory=person))";
adsSearcher.Filter = "(sAMAccountName=" + strAccountId + ")";
try
{
SearchResult adsSearchResult = adsSearcher.FindOne();
bSucceeded = true;
strAuthenticatedBy = "Active Directory";
strError = "User has been authenticated by Active Directory.";
}
catch (Exception ex)
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
strError = ex.Message;
}
finally
{
adsEntry.Close();
}
}
}
}
private void getusera()
{
UserData user = new UserData();
DirectoryEntry entry = new DirectoryEntry("LDAP://DC=mydomain,DC=local");
using (DirectorySearcher ds = new DirectorySearcher(entry))
{
ds.Filter = "(SAMAccountName=" + "myusername" + ")";
ds.PropertiesToLoad.Add("displayName");
ds.PropertiesToLoad.Add("name");
ds.PropertiesToLoad.Add("department");
ds.PropertiesToLoad.Add("physicalDeliveryOfficeName");
var result = ds.FindOne();
if (result != null)
{
try
{
user.Name = result.Properties["name"][0].ToString();
user.Department = result.Properties["department"][0].ToString();
user.Office = result.Properties["physicalDeliveryOfficeName"][0].ToString();
}
catch { }
}
}
}
public bool Get_User(string Userid, ref DirectoryEntry de)
{
var enTry = new DirectoryEntry("LDAP://db.debian.org/uid=meyering,ou=users,dc=debian,dc=org");
// Dim enTry As DirectoryEntry = New DirectoryEntry("LDAP://db.debian.org/uid=abi,ou=users,dc=example,dc=com")
var mySearcher = new DirectorySearcher(enTry);
mySearcher.Filter = "(SAMAccountName=" + Userid + ")";
foreach (System.DirectoryServices.SearchResult resEnt in mySearcher.FindAll())
{
try
{
de = resEnt.GetDirectoryEntry();
Username = de.Properties["givenname"].ToString() + de.Properties["sn"].ToString();
ADError = "";
return true;
}
catch (Exception ex)
{
this.Username = "";
this.ADError = ex.Message;
return false;
}
}
return false;
}
}
}

120
ADDemo/Form1.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

22
ADDemo/Program.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ADDemo
{
internal static class Program
{
/// <summary>
/// Der Haupteinstiegspunkt für die Anwendung.
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1());
}
}
}

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("ADDemo")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("HP Inc.")]
[assembly: AssemblyProduct("ADDemo")]
[assembly: AssemblyCopyright("Copyright © HP Inc. 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
[assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
[assembly: Guid("16ca57ce-b430-4b04-b9be-7e4ff909c7a6")]
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

71
ADDemo/Properties/Resources.Designer.cs generated Normal file
View File

@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion: 4.0.30319.42000
//
// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn
// der Code neu generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace ADDemo.Properties
{
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse
// über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ADDemo.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}

View File

@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

30
ADDemo/Properties/Settings.Designer.cs generated Normal file
View File

@@ -0,0 +1,30 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace ADDemo.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}

View File

@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

BIN
ADDemo/bin/Debug/ADDemo.exe Normal file

Binary file not shown.

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>

BIN
ADDemo/bin/Debug/ADDemo.pdb Normal file

Binary file not shown.

View File

@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1 @@
7e09e81f758559317e635bfe9d9d57ed5f84f90f37a49c7cea79117a4591c6ab

View File

@@ -0,0 +1,10 @@
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\bin\Debug\ADDemo.exe.config
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\bin\Debug\ADDemo.exe
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\bin\Debug\ADDemo.pdb
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.Form1.resources
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.Properties.Resources.resources
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.csproj.GenerateResource.cache
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.exe
E:\Software-Projekte\OnDoc\OnDoc\ADDemo\obj\Debug\ADDemo.pdb

Binary file not shown.

BIN
ADDemo/obj/Debug/ADDemo.exe Normal file

Binary file not shown.

BIN
ADDemo/obj/Debug/ADDemo.pdb Normal file

Binary file not shown.

View File

@@ -2,10 +2,14 @@
using API_NetFramework.Models;
using System;
using System.Collections.Generic;
using System.Data.SqlTypes;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Security.Cryptography;
using System.Web.Http;
using System.Web.Management;
namespace OnDocAPI_NetFramework.Controllers
{
@@ -27,10 +31,30 @@ namespace OnDocAPI_NetFramework.Controllers
{
return Content(HttpStatusCode.Forbidden, empfaenger + ": Email nicht bei der TKB - Mail nicht versandt");
}
string s = "";
try
{
s = System.Configuration.ConfigurationManager.AppSettings["MailParam"];
return Content(HttpStatusCode.OK, "Mail versand noch nicht implementiert");
//return Content(HttpStatusCode.OK, empfaenger + ": Mail versandt");
s = s.Replace("$$empfaenger$$", empfaenger);
s = s.Replace("$$betreff$$", betreff);
s = s.Replace("$$body$$", message);
string debugdir = System.Configuration.ConfigurationManager.AppSettings["DebugDir"];
string tmpfile = debugdir + @"\Mail_" + DateTime.Now.ToString("yyyyMMdd_hhmmss") + ".ps1";
StreamWriter writer = new StreamWriter(tmpfile);
writer.Write(s);
writer.Close();
writer.Dispose();
System.Diagnostics.Process.Start("powershell.exe", tmpfile);
APILogging.Log((HttpRequestMessage)Request, "Mail Versand: " + s, LogLevelType.Debug);
//return Content(HttpStatusCode.OK, "Mail versand noch nicht implementiert");
return Content(HttpStatusCode.OK, empfaenger + ": Mail versandt");
}
catch (Exception e)
{
APILogging.Log((HttpRequestMessage)Request, "Mail Versand NOK: " + e.Message+" " + s, LogLevelType.Debug);
return Content(HttpStatusCode.InternalServerError, e.Message);
}
}
}
}

View File

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc</_PublishTargetUrl>
<History>True|2024-12-02T08:50:13.5426444Z||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<History>True|2024-12-08T08:59:39.7127943Z||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/04/2024 19:25:14</publishTime>
</File>
<File Include="bin/BarcodeLib.dll">
<publishTime>01/12/2024 13:07:40</publishTime>
<publishTime>06/12/2024 13:18:14</publishTime>
</File>
<File Include="bin/BarcodeLib.pdb">
<publishTime>01/12/2024 13:07:40</publishTime>
<publishTime>06/12/2024 13:18:14</publishTime>
</File>
<File Include="bin/CSVNET.dll">
<publishTime>11/23/2024 19:27:07</publishTime>
@@ -94,10 +94,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>11/23/2024 19:27:07</publishTime>
</File>
<File Include="bin/Database.dll">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:49</publishTime>
</File>
<File Include="bin/Database.pdb">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:49</publishTime>
</File>
<File Include="bin/de/System.Net.Http.Formatting.resources.dll">
<publishTime>10/20/2023 22:35:02</publishTime>
@@ -130,13 +130,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/20/2023 22:35:04</publishTime>
</File>
<File Include="bin/DOCGEN.dll">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:49</publishTime>
</File>
<File Include="bin/DOCGEN.dll.config">
<publishTime>11/25/2024 07:24:47</publishTime>
</File>
<File Include="bin/DOCGEN.pdb">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:49</publishTime>
</File>
<File Include="bin/FastReport.Bars.dll">
<publishTime>11/27/2023 09:49:58</publishTime>
@@ -214,10 +214,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>11/04/2022 19:09:46</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>01/12/2024 18:53:52</publishTime>
<publishTime>08/12/2024 09:26:48</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>01/12/2024 18:53:52</publishTime>
<publishTime>08/12/2024 09:26:48</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.Bson.dll">
<publishTime>11/28/2018 00:10:18</publishTime>
@@ -235,22 +235,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>04/30/2024 21:58:24</publishTime>
</File>
<File Include="bin/OfficePrinter.dll">
<publishTime>11/27/2024 13:31:56</publishTime>
<publishTime>07/12/2024 10:39:16</publishTime>
</File>
<File Include="bin/OfficePrinter.pdb">
<publishTime>11/27/2024 13:31:56</publishTime>
<publishTime>07/12/2024 10:39:16</publishTime>
</File>
<File Include="bin/OnDocOffice.dll">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:48</publishTime>
</File>
<File Include="bin/OnDocOffice.pdb">
<publishTime>12/02/2024 09:50:12</publishTime>
<publishTime>08/12/2024 09:26:48</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.dll">
<publishTime>12/02/2024 10:19:11</publishTime>
<publishTime>12/08/2024 09:59:38</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.pdb">
<publishTime>12/02/2024 10:19:11</publishTime>
<publishTime>12/08/2024 09:59:38</publishTime>
</File>
<File Include="bin/Owin.dll">
<publishTime>11/13/2012 13:19:34</publishTime>
@@ -634,7 +634,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="Web.config">
<publishTime>01/12/2024 18:53:53</publishTime>
<publishTime>12/08/2024 09:59:38</publishTime>
</File>
</ItemGroup>
</Project>

View File

@@ -30,6 +30,8 @@
<add key="ArchivierungOfficeFormat" value="1983,2396,2397,2421" />
<add key="ExcelValueFile" value="x:\exceldata.csv" />
<add key="ExcelDokType" value="2421" />
<add key="ExcelDokType" value="2421" />
<add key="MailParam" value='Send-MailMessage -from "OnDoc@tkb.ch" -to "$$empfaenger$$" -Subject "$$betreff$$" -Body "$$body$$" -smtpServer smtp.tgcorp.ch'/>
</appSettings>
<connectionStrings>
<add name="EDOKAConnectionstring" connectionString="Po7oIigu4hOz6zXOpaSnrhveCQyfGgFeskvEQsvm3CEgxjJMEYYDEbnWlt9Qr9vGTkzqm5hvURTLA1hKVU++/ozcvT5qIVTpDLBTKd4AM/4YgN3+L9cx3mxMoWmv1JMjqxZVbR6GYiuSo1xuD05sl3IGoUenfugP6hBP/IC7MjUjisDUE6msFpWiraJr53gcfDvIrc2CUBTVUS+f94kewhlKxjtEohtCM71PN2zpoMiPyBIuXDyrYlYyokUOg6uV" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -30,6 +30,8 @@
<add key="ArchivierungOfficeFormat" value="1983,2396,2397,2421" />
<add key="ExcelValueFile" value="x:\exceldata.csv" />
<add key="ExcelDokType" value="2421" />
<add key="ExcelDokType" value="2421" />
<add key="MailParam" value='Send-MailMessage -from "OnDoc@tkb.ch" -to "$$empfaenger$$" -Subject "$$betreff$$" -Body "$$body$$" -smtpServer smtp.tgcorp.ch'/>
</appSettings>
<connectionStrings>
<add name="EDOKAConnectionstring" connectionString="Po7oIigu4hOz6zXOpaSnrhveCQyfGgFeskvEQsvm3CEgxjJMEYYDEbnWlt9Qr9vGTkzqm5hvURTLA1hKVU++/ozcvT5qIVTpDLBTKd4AM/4YgN3+L9cx3mxMoWmv1JMjqxZVbR6GYiuSo1xuD05sl3IGoUenfugP6hBP/IC7MjUjisDUE6msFpWiraJr53gcfDvIrc2CUBTVUS+f94kewhlKxjtEohtCM71PN2zpoMiPyBIuXDyrYlYyokUOg6uV" />

View File

@@ -2043,3 +2043,9 @@ Parametername: encoder
2024-12-02 10:10:17.1969|DEBUG|OnDoc|Mailversand: test@tkb.ch11
2024-12-02 10:11:10.9145|DEBUG|OnDoc|Mailversand: test@tkb.ch324
2024-12-04 10:19:03.3793|ERROR|OnDoc|Unberechtigter Zugriff
2024-12-08 09:00:42.3530|DEBUG|OnDoc|Mailversand: stefan.hutter@tkb.chTest OnDoc-Mail
2024-12-08 09:00:43.1082|ERROR|OnDoc|Unberechtigter Zugriff
2024-12-08 09:03:11.1409|DEBUG|OnDoc|Mailversand: stefan.hutter@tkb.chtest ondoc-mail
2024-12-08 09:03:11.2413|ERROR|OnDoc|Unberechtigter Zugriff
2024-12-08 09:03:54.8170|DEBUG|OnDoc|Mail Versand
2024-12-08 09:58:27.1958|DEBUG|OnDoc|Mailversand: gaga111

View File

@@ -30,6 +30,8 @@
<add key="ArchivierungOfficeFormat" value="1983,2396,2397,2421" />
<add key="ExcelValueFile" value="x:\exceldata.csv" />
<add key="ExcelDokType" value="2421" />
<add key="ExcelDokType" value="2421" />
<add key="MailParam" value="Send-MailMessage -from &quot;OnDoc@tkb.ch&quot; -to &quot;$$empfaenger$$&quot; -Subject &quot;$$betreff$$&quot; -Body &quot;$$body$$&quot; -smtpServer smtp.tgcorp.ch" />
</appSettings>
<connectionStrings>
<add name="EDOKAConnectionstring" connectionString="Po7oIigu4hOz6zXOpaSnrhveCQyfGgFeskvEQsvm3CEgxjJMEYYDEbnWlt9Qr9vGTkzqm5hvURTLA1hKVU++/ozcvT5qIVTpDLBTKd4AM/4YgN3+L9cx3mxMoWmv1JMjqxZVbR6GYiuSo1xuD05sl3IGoUenfugP6hBP/IC7MjUjisDUE6msFpWiraJr53gcfDvIrc2CUBTVUS+f94kewhlKxjtEohtCM71PN2zpoMiPyBIuXDyrYlYyokUOg6uV" />

View File

@@ -30,6 +30,8 @@
<add key="ArchivierungOfficeFormat" value="1983,2396,2397,2421" />
<add key="ExcelValueFile" value="x:\exceldata.csv" />
<add key="ExcelDokType" value="2421" />
<add key="ExcelDokType" value="2421" />
<add key="MailParam" value='Send-MailMessage -from "OnDoc@tkb.ch" -to "$$empfaenger$$" -Subject "$$betreff$$" -Body "$$body$$" -smtpServer smtp.tgcorp.ch'/>
</appSettings>
<connectionStrings>
<add name="EDOKAConnectionstring" connectionString="Po7oIigu4hOz6zXOpaSnrhveCQyfGgFeskvEQsvm3CEgxjJMEYYDEbnWlt9Qr9vGTkzqm5hvURTLA1hKVU++/ozcvT5qIVTpDLBTKd4AM/4YgN3+L9cx3mxMoWmv1JMjqxZVbR6GYiuSo1xuD05sl3IGoUenfugP6hBP/IC7MjUjisDUE6msFpWiraJr53gcfDvIrc2CUBTVUS+f94kewhlKxjtEohtCM71PN2zpoMiPyBIuXDyrYlYyokUOg6uV" />

View File

@@ -30,6 +30,8 @@
<add key="ArchivierungOfficeFormat" value="1983,2396,2397,2421" />
<add key="ExcelValueFile" value="x:\exceldata.csv" />
<add key="ExcelDokType" value="2421" />
<add key="ExcelDokType" value="2421" />
<add key="MailParam" value="Send-MailMessage -from &quot;OnDoc@tkb.ch&quot; -to &quot;$$empfaenger$$&quot; -Subject &quot;$$betreff$$&quot; -Body &quot;$$body$$&quot; -smtpServer smtp.tgcorp.ch" />
</appSettings>
<connectionStrings>
<add name="EDOKAConnectionstring" connectionString="Po7oIigu4hOz6zXOpaSnrhveCQyfGgFeskvEQsvm3CEgxjJMEYYDEbnWlt9Qr9vGTkzqm5hvURTLA1hKVU++/ozcvT5qIVTpDLBTKd4AM/4YgN3+L9cx3mxMoWmv1JMjqxZVbR6GYiuSo1xuD05sl3IGoUenfugP6hBP/IC7MjUjisDUE6msFpWiraJr53gcfDvIrc2CUBTVUS+f94kewhlKxjtEohtCM71PN2zpoMiPyBIuXDyrYlYyokUOg6uV" />

Binary file not shown.

Binary file not shown.

View File

@@ -17,7 +17,7 @@
<value>NO</value>
</setting>
<setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value>
<value>DateiDrukenStandard</value>
</setting>
<setting name="VBVorlagenmanagement" serializeAs="String">
<value>Yes</value>
@@ -26,7 +26,7 @@
<value />
</setting>
<setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\TKB - Vorlagen\</value>
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
</setting>
<setting name="Connectionstring_Prod" serializeAs="String">
<value />
@@ -47,7 +47,13 @@
<value>Arial</value>
</setting>
<setting name="ZusatzFontSize" serializeAs="String">
<value>14</value>
<value>9</value>
</setting>
<setting name="edokapath" serializeAs="String">
<value>E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe</value>
</setting>
<setting name="OfficeWatchTimerIntervall" serializeAs="String">
<value>5000</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>

View File

@@ -149,6 +149,12 @@
<Compile Include="Diverses\SaveAnsicht.Designer.cs">
<DependentUpon>SaveAnsicht.cs</DependentUpon>
</Compile>
<Compile Include="Diverses\SplashScreen.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Diverses\SplashScreen.Designer.cs">
<DependentUpon>SplashScreen.cs</DependentUpon>
</Compile>
<Compile Include="Diverses\testx.cs">
<SubType>Form</SubType>
</Compile>
@@ -382,6 +388,9 @@
<EmbeddedResource Include="Diverses\SaveAnsicht.resx">
<DependentUpon>SaveAnsicht.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Diverses\SplashScreen.resx">
<DependentUpon>SplashScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Diverses\testx.resx">
<DependentUpon>testx.cs</DependentUpon>
</EmbeddedResource>
@@ -587,6 +596,27 @@
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc6_Transparent.ico" />
<None Include="Resources\Person_32x32-32.png" />
<None Include="Resources\Person_24x24-32.png" />
<None Include="Resources\Person_16x16-32.png" />
<None Include="Resources\Person_256x256-32.png" />
<None Include="Resources\Person_48x48-32.png" />
<None Include="Resources\Person_16x16-32 %282%291.png" />
<None Include="Resources\Person_48x48-321.png" />
<None Include="Resources\Person_32x32-321.png" />
<None Include="Resources\Person_256x256-321.png" />
<None Include="Resources\Person_24x24-321.png" />
<None Include="Resources\Person_16x16-321.png" />
<None Include="Resources\Person_32x32-32 %282%29.png" />
<None Include="Resources\Person_24x24-32 %282%29.png" />
<None Include="Resources\Person_16x16-32 %282%29.png" />
<None Include="Resources\Person_256x256-32 %282%29.png" />
<None Include="Resources\Person_48x48-32 %282%29.png" />
<None Include="Resources\Attribut_48x48-32.png" />
<None Include="Resources\Attribut_32x32-32.png" />
<None Include="Resources\Attribut_24x24-32.png" />
<None Include="Resources\Attribut_16x16-32.png" />
<None Include="Resources\Attribut_256x256-32.png" />
<None Include="Resources\officevorlage_256x256-32.png" />
<None Include="Resources\officevorlage_48x48-32.png" />
<None Include="Resources\officevorlage_32x32-32.png" />

View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>K:\EDOKA\EDK_Dateien\3bv.edk</StartArguments>
<StartArguments>
</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>

View File

@@ -54,7 +54,7 @@
//
// treeView
//
this.treeView.Dock = System.Windows.Forms.DockStyle.Left;
this.treeView.Dock = System.Windows.Forms.DockStyle.Top;
this.treeView.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText;
this.treeView.FullRowSelect = true;
this.treeView.HideSelection = false;
@@ -64,7 +64,7 @@
this.treeView.Location = new System.Drawing.Point(2, 2);
this.treeView.Name = "treeView";
this.treeView.SelectedImageIndex = 0;
this.treeView.Size = new System.Drawing.Size(296, 446);
this.treeView.Size = new System.Drawing.Size(294, 403);
this.treeView.TabIndex = 1;
this.treeView.DrawNode += new System.Windows.Forms.DrawTreeNodeEventHandler(this.treeView_DrawNode);
this.treeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView_NodeMouseDoubleClick);
@@ -121,9 +121,9 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(319, 422);
this.button1.Location = new System.Drawing.Point(2, 411);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.Size = new System.Drawing.Size(294, 23);
this.button1.TabIndex = 4;
this.button1.Text = "Erstellen";
this.button1.UseVisualStyleBackColor = true;
@@ -133,7 +133,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(533, 450);
this.ClientSize = new System.Drawing.Size(298, 450);
this.Controls.Add(this.button1);
this.Controls.Add(this.label1);
this.Controls.Add(this.treeView);

View File

@@ -97,13 +97,14 @@ namespace OnDoc.Diverses
foreach (FileInfo file in directoryInfo.GetFiles())
{
if (file.Exists && file.Name!="klassifizierung.txt")
if (file.Exists && file.Name!="Klassifizierung.txt")
{
ext = System.IO.Path.GetExtension(file.Name);
TreeNode tnnew = new TreeNode();
tnnew.Text = file.Name;
tnnew.Tag = file.FullName;
Logging.Logging.Debug("Load Nativ: " + file.FullName,"OnDoc","");
tnnew.ImageIndex = 4;
if (ext.Length > 2)
@@ -257,55 +258,72 @@ namespace OnDoc.Diverses
catch { }
try
{
string tempfilename = treeNode.Tag.ToString();
Logging.Logging.Debug("Nativ-Vorlage: " + tempfilename, "OnDoc", "");
if (tempfilename == "") { return; }
//string tempdir = AppParams.tempdir + "\nativdoks";
string ext = System.IO.Path.GetExtension(tempfilename);
Logging.Logging.Debug("Native-Vorlage erstellen", "OnDoc", tempfilename);
if (ext.Length > 2)
{
ext = ext.Substring(0, 2).ToUpper();
string tempfilename1 = "";
switch (ext)
{
case ".D":
DOCGEN.Klassen.SyncFWord sf = new DOCGEN.Klassen.SyncFWord("","");
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
sf.create_nativ("Klassifizierung", klassifizierung, "", tempfilename, tempfilename1);
System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename1);
string tempfilename1 = "";
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
//System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename);
break;
case ".X":
DOCGEN.Klassen.SyncFExcel ef = new DOCGEN.Klassen.SyncFExcel();
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
System.IO.File.Copy(tempfilename, tempfilename1, true);
Process.Start(tempfilename1);
// if (ext.Length > 2)
// {
// ext = ext.Substring(0, 2).ToUpper();
// string tempfilename1 = "";
// switch (ext)
// {
// case ".D":
//// DOCGEN.Klassen.SyncFWord sf = new DOCGEN.Klassen.SyncFWord("","");
// tempfilename1 = System.IO.Path.GetFileName(tempfilename);
// tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
// System.IO.File.Copy(tempfilename,tempfilename1,true);
ef.create_nativ("Klassifizierung", klassifizierung, "", tempfilename, tempfilename1);
// // Logging.Logging.Debug("sfcreate.native", "OnDoc", tempfilename1);
// // sf.create_nativ("Klassifizierung", klassifizierung, "", tempfilename, tempfilename1);
// System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename1);
System.Diagnostics.Process.Start("excel.exe", " /t " + tempfilename1);
break;
case ".P":
DOCGEN.Klassen.SyncFPowerPoint pf = new DOCGEN.Klassen.SyncFPowerPoint();
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
pf.create_nativ("Klassifizierung", klassifizierung,"",tempfilename,tempfilename1);
System.Diagnostics.Process.Start("POWERPNT.EXE", " /N " + tempfilename1);
break;
default:
tempfilename1 = System.IO.Path.GetFileName(tempfilename);
tempfilename1 = AppParams.tempdir+ "" + DateTime.Now.ToString("yyyyMMddhhmmss") +tempfilename1;
System.IO.File.Copy(tempfilename,tempfilename1, true);
Process.Start(tempfilename1);
break;
}
// //System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename);
// break;
// case ".X":
// //DOCGEN.Klassen.SyncFExcel ef = new DOCGEN.Klassen.SyncFExcel();
// tempfilename1 = System.IO.Path.GetFileName(tempfilename);
// tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
// System.IO.File.Copy(tempfilename,tempfilename1,true);
}
// //ef.create_nativ("Klassifizierung", klassifizierung, "", tempfilename, tempfilename1);
// System.Diagnostics.Process.Start("excel.exe", " /t " + tempfilename1);
// break;
// case ".P":
// //DOCGEN.Klassen.SyncFPowerPoint pf = new DOCGEN.Klassen.SyncFPowerPoint();
// tempfilename1 = System.IO.Path.GetFileName(tempfilename);
// tempfilename1 = AppParams.tempdir + "" + DateTime.Now.ToString("yyyyMMddhhmmss") + tempfilename1;
// System.IO.File.Copy(tempfilename, tempfilename1,true);
// //pf.create_nativ("Klassifizierung", klassifizierung,"",tempfilename,tempfilename1);
// System.Diagnostics.Process.Start("POWERPNT.EXE", " /N " + tempfilename1);
// break;
// default:
// tempfilename1 = System.IO.Path.GetFileName(tempfilename);
// tempfilename1 = AppParams.tempdir+ "" + DateTime.Now.ToString("yyyyMMddhhmmss") +tempfilename1;
// System.IO.File.Copy(tempfilename,tempfilename1, true);
// Process.Start(tempfilename1);
// break;
// }
// }
}
catch (Exception e) {
Logging.Logging.Debug("Start Nativ: " + e.Message, "OnDoc", "");
}
catch { }
}
private void button1_Click(object sender, EventArgs e)

View File

@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4
DAAAAk1TRnQBSQFMAgEBBQEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

95
Client/Diverses/SplashScreen.Designer.cs generated Normal file
View File

@@ -0,0 +1,95 @@
namespace OnDoc.Diverses
{
partial class SplashScreen
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SplashScreen));
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// pictureBox1
//
this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage")));
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage")));
this.pictureBox1.Location = new System.Drawing.Point(104, 25);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(261, 258);
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(164, 304);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(122, 26);
this.label1.TabIndex = 1;
this.label1.Text = "Version 0.8";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(129, 339);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(203, 26);
this.label2.TabIndex = 2;
this.label2.Text = "11. Dezember 2024";
//
// SplashScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(469, 396);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "SplashScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "SplashScreen";
this.Shown += new System.EventHandler(this.SplashScreen_Shown);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
}
}

View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnDoc.Diverses
{
public partial class SplashScreen : Form
{
Timer tmr;
public SplashScreen()
{
InitializeComponent();
Application.DoEvents();
}
private void SplashScreen_Shown(object sender, EventArgs e)
{
tmr = new Timer();
tmr.Interval = 5000;
tmr.Start();
Application.DoEvents();
tmr.Tick += tmr_Tick;
}
void tmr_Tick(object sender, EventArgs e)
{
Application.DoEvents();
tmr.Stop();
this.Hide();
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -29,11 +29,10 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenterstellung));
Model.clsdocgendata clsdocgendata2 = new Model.clsdocgendata();
Model.clsdocgendata clsdocgendata1 = new Model.clsdocgendata();
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
@@ -48,6 +47,8 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.label7 = new System.Windows.Forms.Label();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -83,18 +84,10 @@
this.PnlPreview.TabIndex = 19;
this.PnlPreview.Visible = false;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// GrpFnkt
//
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
this.GrpFnkt.Controls.Add(this.label7);
this.GrpFnkt.Controls.Add(this.btnOfficePrint);
this.GrpFnkt.Controls.Add(this.label6);
this.GrpFnkt.Controls.Add(this.label5);
@@ -120,7 +113,7 @@
// btnOfficePrint
//
this.btnOfficePrint.Image = global::OnDoc.Properties.Resources.Printer_48x48_32;
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Location = new System.Drawing.Point(289, 17);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
@@ -131,7 +124,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(334, 99);
this.label6.Location = new System.Drawing.Point(515, 101);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(79, 13);
this.label6.TabIndex = 11;
@@ -141,7 +134,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(345, 86);
this.label5.Location = new System.Drawing.Point(525, 88);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 13);
this.label5.TabIndex = 10;
@@ -151,7 +144,7 @@
// ribbonButtonVersandstrasse
//
this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32;
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(338, 15);
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(519, 17);
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.Size = new System.Drawing.Size(75, 81);
this.ribbonButtonVersandstrasse.TabIndex = 9;
@@ -163,7 +156,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(264, 84);
this.label4.Location = new System.Drawing.Point(376, 91);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(60, 13);
this.label4.TabIndex = 8;
@@ -172,7 +165,7 @@
// ribbonButtonArchiv
//
this.ribbonButtonArchiv.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonArchiv.Image")));
this.ribbonButtonArchiv.Location = new System.Drawing.Point(257, 16);
this.ribbonButtonArchiv.Location = new System.Drawing.Point(369, 20);
this.ribbonButtonArchiv.Name = "ribbonButtonArchiv";
this.ribbonButtonArchiv.Size = new System.Drawing.Size(75, 81);
this.ribbonButtonArchiv.TabIndex = 7;
@@ -249,6 +242,24 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(303, 86);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(48, 13);
this.label7.TabIndex = 13;
this.label7.Text = "Drucken";
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// ucAllgemeineDokumentParam1
//
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
@@ -256,29 +267,29 @@
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
this.ucAllgemeineDokumentParam1.check_error = "";
this.ucAllgemeineDokumentParam1.checkpartner = true;
clsdocgendata2.bezeichnung = null;
clsdocgendata2.digitaleunterschrift = false;
clsdocgendata2.dokumentdatum = null;
clsdocgendata2.dokumenttypnr = null;
clsdocgendata2.dokumentwerte = null;
clsdocgendata2.ersteller = null;
clsdocgendata2.erstelling_in_office = false;
clsdocgendata2.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata2.frormularOhneUnterschrift = false;
clsdocgendata2.inhaberadresse = null;
clsdocgendata2.logo = "";
clsdocgendata2.partnernr = null;
clsdocgendata2.postzustellung = null;
clsdocgendata2.status = null;
clsdocgendata2.team = null;
clsdocgendata2.unterschriftLinks = null;
clsdocgendata2.unterschriftRehts = null;
clsdocgendata2.verantwortlich = null;
clsdocgendata2.versandstrasse_moeglich = false;
clsdocgendata2.zustaendigkube = null;
clsdocgendata2.zustaendigmitarbeiter = null;
clsdocgendata2.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata2;
clsdocgendata1.bezeichnung = null;
clsdocgendata1.digitaleunterschrift = false;
clsdocgendata1.dokumentdatum = null;
clsdocgendata1.dokumenttypnr = null;
clsdocgendata1.dokumentwerte = null;
clsdocgendata1.ersteller = null;
clsdocgendata1.erstelling_in_office = false;
clsdocgendata1.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata1.frormularOhneUnterschrift = false;
clsdocgendata1.inhaberadresse = null;
clsdocgendata1.logo = "";
clsdocgendata1.partnernr = null;
clsdocgendata1.postzustellung = null;
clsdocgendata1.status = null;
clsdocgendata1.team = null;
clsdocgendata1.unterschriftLinks = null;
clsdocgendata1.unterschriftRehts = null;
clsdocgendata1.verantwortlich = null;
clsdocgendata1.versandstrasse_moeglich = false;
clsdocgendata1.zustaendigkube = null;
clsdocgendata1.zustaendigmitarbeiter = null;
clsdocgendata1.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
this.ucAllgemeineDokumentParam1.interop = false;
@@ -336,5 +347,6 @@
private System.Windows.Forms.Label lbledit;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnOfficePrint;
private System.Windows.Forms.Label label7;
}
}

View File

@@ -253,15 +253,31 @@ namespace OnDoc.DocMgmt
private void btnOfficePrint_Click(object sender, EventArgs e)
{
clsdok dok = new clsdok("", "", "");
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
DocGet gd = new DocGet(AppParams.connectionstring);
{
dok = gd.GetDoc(dokumentid);
}
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename );
op.PrintInWord(Filename, AppParams.wordprintmacro);
if (dok.doktype == "D")
{
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
op = null;
}
if (dok.doktype == "P")
{
docPreview1.printpdf();
}
if (dok.doktype == "X")
{
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
}
}
}
}

View File

@@ -148,7 +148,7 @@
this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon1.OrbVisible = false;
this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon1.Size = new System.Drawing.Size(1807, 121);
this.ribbon1.Size = new System.Drawing.Size(2120, 121);
this.ribbon1.TabIndex = 17;
this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.TabSpacing = 4;
@@ -260,7 +260,7 @@
this.pnlfooter.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlfooter.Location = new System.Drawing.Point(2, 802);
this.pnlfooter.Name = "pnlfooter";
this.pnlfooter.Size = new System.Drawing.Size(1807, 47);
this.pnlfooter.Size = new System.Drawing.Size(2120, 47);
this.pnlfooter.TabIndex = 20;
//
// progressBarAdv1
@@ -270,14 +270,15 @@
this.progressBarAdv1.BackSegments = false;
this.progressBarAdv1.CustomText = null;
this.progressBarAdv1.CustomWaitingRender = false;
this.progressBarAdv1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.progressBarAdv1.ForeColor = System.Drawing.Color.Blue;
this.progressBarAdv1.ForegroundImage = null;
this.progressBarAdv1.Location = new System.Drawing.Point(16, 16);
this.progressBarAdv1.Location = new System.Drawing.Point(0, 24);
this.progressBarAdv1.MultipleColors = new System.Drawing.Color[] {
System.Drawing.Color.Empty};
this.progressBarAdv1.Name = "progressBarAdv1";
this.progressBarAdv1.SegmentWidth = 12;
this.progressBarAdv1.Size = new System.Drawing.Size(1733, 23);
this.progressBarAdv1.Size = new System.Drawing.Size(2120, 23);
this.progressBarAdv1.TabIndex = 0;
this.progressBarAdv1.Text = "progressBarGeneraate";
this.progressBarAdv1.Visible = false;
@@ -348,7 +349,7 @@
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.Location = new System.Drawing.Point(1326, 123);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(483, 679);
this.groupBox3.Size = new System.Drawing.Size(796, 679);
this.groupBox3.TabIndex = 23;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Generierte Dokumente";
@@ -370,14 +371,14 @@
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.selected_partnernr = null;
this.dokList1.Size = new System.Drawing.Size(477, 660);
this.dokList1.Size = new System.Drawing.Size(790, 660);
this.dokList1.TabIndex = 0;
//
// Dokumentpaket
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1811, 851);
this.ClientSize = new System.Drawing.Size(2124, 851);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.pnlleft);

View File

@@ -100,7 +100,7 @@ namespace OnDoc.DocMgmt
if (!NeuesDokumentpaket()){ this.Close(); return; };
}
Update_PaketDetails();
dokList1.set_vorschau_aus_dp();
if (this.txtbpnummer.Text == "") { btnSearchBP_Click(sender, e); }
this.EndUpdate();

View File

@@ -40,6 +40,7 @@ using Windows.Perception.Spatial;
using static Model.OnBaseDocUpload;
using static BroadcastListener.Classes.Factory;
using Microsoft.Office.Interop.Excel;
using Microsoft.SqlServer.Server;
namespace OnDoc.UIControls
@@ -94,7 +95,7 @@ namespace OnDoc.UIControls
{
if (message == "BtnSBVorschau")
{
if (sender.SenderName=="Serienbriefbearbeitung")
if (sender.SenderName == "Serienbriefbearbeitung")
{
string[] details = sender.Function.Split(' ');
foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
@@ -102,7 +103,7 @@ namespace OnDoc.UIControls
if (dr[0].ToString() == details[0].ToString())
{
IsPreview = true;
PreviewFiename = sender.Details.ToString()+".tmp";
PreviewFiename = sender.Details.ToString() + ".tmp";
ribbonbuttonsave_Click(sender, null);
Generate(Convert.ToInt32(dr["intEintragnr"]));
System.IO.File.Delete(PreviewFiename);
@@ -112,7 +113,7 @@ namespace OnDoc.UIControls
}
}
}
if (message== "BtnSBVorschauSave")
if (message == "BtnSBVorschauSave")
{
ribbonbuttonsave_Click(sender, null);
}
@@ -130,7 +131,7 @@ namespace OnDoc.UIControls
ribbonbuttonsave.Enabled = false;
ribbonButtonDelete.Enabled = false;
RibbonButtonExcelImport.Enabled = false;
ribbonbuttonaddpartner.Enabled= false;
ribbonbuttonaddpartner.Enabled = false;
ribbonButtonPartnerPruefen.Enabled = false;
ribbonButtonVorlageBearbeiten.Enabled = false;
ribbonbuttonaddpartner.Enabled = false;
@@ -233,6 +234,7 @@ namespace OnDoc.UIControls
private void RibbonButtonExcelImport_Click(object sender, EventArgs e)
{
System.Data.DataTable importdata = new System.Data.DataTable();
openFileDialog1.Filter = "Excel-Dateien files (*.xlsx)|*.xlsx|CSV-Dateien (*.csv)|*.csv|Alle Dateien (*.*)|*.*";
openFileDialog1.FilterIndex = 0;
@@ -262,7 +264,7 @@ namespace OnDoc.UIControls
MessageBox.Show("Die ausgewählten Daten können nicht verwendet werden.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (importdata.Columns[0].Caption.ToUpper() != "PARTNERNR")
if (importdata.Columns[0].Caption != "Partnernr")
{
MessageBox.Show("Die importierten Daten enthalten keine Spalte 'Partnernr'. Der Vorgang wird abgebrochen.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error);
importdata.Rows.Clear();
@@ -270,6 +272,14 @@ namespace OnDoc.UIControls
return;
}
DB dB = new DB(AppParams.connectionstring);
if (sb.dsempfaenger.Tables[0].Rows.Count == 1)
{
if (sb.dsempfaenger.Tables[0].Rows[0]["Partnernr"].ToString().Trim() == "")
{
sb.dsempfaenger.Tables[0].Rows[0].Delete();
sb.dsempfaenger.AcceptChanges();
}
}
//sb.dsempfaenger.Tables[0].Rows.Clear();
bool found = false;
foreach (System.Data.DataColumn dc in importdata.Columns)
@@ -288,11 +298,11 @@ namespace OnDoc.UIControls
}
catch { }
}
}
importdata.AcceptChanges();
found=false;
found = false;
foreach (System.Data.DataColumn dc in sb.dsempfaenger.Tables[0].Columns)
{
if (dc.ColumnName.ToUpper() == "INTEINTRAGNR") { found = true; }
@@ -312,7 +322,14 @@ namespace OnDoc.UIControls
r1[col.ColumnName] = dr[col.ColumnName];
}
catch { r1[col.ColumnName] = ""; }
catch
{
try
{
r1["$$" + col.ColumnName + "$$"] = dr[col.ColumnName];
}
catch { r1[col.ColumnName] = ""; }
}
}
r1["STATUS"] = 0;
@@ -325,11 +342,19 @@ namespace OnDoc.UIControls
//}
//catch { }
dB.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + r1[0].ToString(), false, true);
if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
sb.dsempfaenger.Tables[0].Rows.Add(r1);
try
{
if (dB.dsdaten.Tables[0].Rows.Count > 0)
{
if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
sb.dsempfaenger.Tables[0].Rows.Add(r1);
}
}
catch { }
}
dB = null;
Partnerliste_Pruefen();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
finish_progress();
@@ -349,39 +374,44 @@ namespace OnDoc.UIControls
{
// sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
}
catch {
catch
{
sb.dsempfaenger.Tables[0].Columns.Add("IntEintragnr");
}
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = true;
sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Anrede"].Width = 0;
sfDataGridEmpfaenger.Columns["Name"].Visible = false;
sfDataGridEmpfaenger.Columns["Vorname"].Visible = false;
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
try
{
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = true;
//sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
sfDataGridEmpfaenger.Columns["Anrede"].Width = 0;
sfDataGridEmpfaenger.Columns["Name"].Visible = false;
sfDataGridEmpfaenger.Columns["Vorname"].Visible = false;
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
catch { }
}
private void init_empfaenger(int serienbriefnr)
{
Database.DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dbo.BinaryToBase64(xmldata) as Data from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString(), false, true);
Base64Helper bh = new Base64Helper();
bh.Base64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
string xml = bh.DecodeBase64();
string filename = AppParams.tempdir + @"\"+sb.serienbriefnr.ToString()+".xml";
string filename = AppParams.tempdir + @"\" + sb.serienbriefnr.ToString() + ".xml";
System.IO.File.WriteAllText(filename, xml);
//dsempfaenger.Tables.Clear();
//dsempfaenger.ReadXml(filename);
@@ -407,11 +437,12 @@ namespace OnDoc.UIControls
try
{
panelLoad.Visible = true;
System.Windows.Forms.Application.DoEvents();
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
init_empfaenger(-1);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
@@ -433,7 +464,7 @@ namespace OnDoc.UIControls
panelLoad.Visible = false;
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
else
{
@@ -444,7 +475,7 @@ namespace OnDoc.UIControls
private void vorlage_auslesen_und_speichern()
{
DOCGEN.DocGet dg = new DOCGEN.DocGet(AppParams.connectionstring);
string filedata = dg.get_word_vorlage(sb.officevorlagenr);
@@ -455,7 +486,7 @@ namespace OnDoc.UIControls
dB.Get_ApplicationType_from_Vorlage(sb.officevorlagenr);
string Apptype = "";
Apptype = dB.dsdaten.Tables[0].Rows[0][1].ToString();
string filename = AppParams.tempdir+sb.serienbriefnr.ToString() + "." + Apptype;
string filename = AppParams.tempdir + sb.serienbriefnr.ToString() + "." + Apptype;
fh.SaveBase64ToFile(filedata, filename);
sb.filename = filename;
}
@@ -481,7 +512,7 @@ namespace OnDoc.UIControls
//dB.Save_To_DB("", "", filedata, sb.serienbriefnr);
//sb.filename = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
//// sb.filename = dB.save_sb_vorlage_to_db(filename, Apptype, sb.serienbriefnr);
private void vorlagenfelder(int dokumenttypnr)
{
DB db = new DB(AppParams.connectionstring);
@@ -549,9 +580,9 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString();
sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]);
sb.vertrag= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);
db.Get_Tabledata("Select beschreibung from physischesarchiv where phyischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(),false,true);
sb.vertrag = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);
db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(), false, true);
sb.barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (sb.barcode_zusatz != "") { sb.barcode_zusatz = " / " + sb.barcode_zusatz; }
}
@@ -580,7 +611,8 @@ namespace OnDoc.UIControls
{
sb.faksimile_unterschrfit = "False";
}
} catch { sb.faksimile_unterschrfit = "False"; }
}
catch { sb.faksimile_unterschrfit = "False"; }
try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; }
sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value);
@@ -594,8 +626,6 @@ namespace OnDoc.UIControls
else { db.save_sb_vorlage_to_db(PreviewFiename, "", sb.serienbriefnr); }
}
private void update_zahlen()
{
try
@@ -605,7 +635,9 @@ namespace OnDoc.UIControls
int fehlerhaft = 0;
int generiert = 0;
int abgeschlossen = 0;
sb.dsempfaenger.AcceptChanges();
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
dv.RowFilter = "Status = 0";
treeViewAdv1.Nodes[0].Text = "In Bearbeitung (" + dv.Count.ToString() + ")";
@@ -624,14 +656,14 @@ namespace OnDoc.UIControls
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
update_grid();
enable_disable_functions(2,false);
enable_disable_functions(2, false);
if (inbearbeitung > 0) { RibbonButtonGenerateSB.Enabled = true; }
if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0)
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonDruckstapel.Enabled = true;
}
enable_disable_functions(3, true);
if (generiert > 0 || abgeschlossen > 0)
{
@@ -642,7 +674,7 @@ namespace OnDoc.UIControls
catch { }
}
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
update_grid();
@@ -673,7 +705,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
enable_disable_functions(4, false);
break;
case "Gener":
dv.RowFilter = "Status = 1";
@@ -717,7 +749,7 @@ namespace OnDoc.UIControls
System.Windows.Forms.Application.DoEvents();
}
@@ -726,7 +758,8 @@ namespace OnDoc.UIControls
{
open_sb(selectedsbnr);
}
private void open_sb(int serienbriefnr) {
private void open_sb(int serienbriefnr)
{
DB db = new DB(AppParams.connectionstring);
sb = new serienbrief();
sb.dsempfaenger = new DataSet();
@@ -741,7 +774,7 @@ namespace OnDoc.UIControls
sb.barcode_type = db.dsdaten.Tables[0].Rows[0]["barcodetype"].ToString();
sb.barcode_content = db.dsdaten.Tables[0].Rows[0]["datamatrixcontent"].ToString();
string sql = "";
@@ -758,9 +791,9 @@ namespace OnDoc.UIControls
}
sb.barcode_font = AppParams.barcodefont;
sb.barcode_fontsize = AppParams.barcodefontsize;
sb.barcode_textposition=AppParams.barcodetextposition;
sb.barcode_textposition = AppParams.barcodetextposition;
sb.barcode_zusatz = "";
sb.filename = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
pnlLoad.Visible = false;
@@ -779,9 +812,9 @@ namespace OnDoc.UIControls
DateDokumentDatum.Value = sb.archivdatum;
switch (sb.ppfaktura)
{
case 0:rbppohne.Checked = true;break;
case 1: rbppa.Checked = true;break;
case 2:rbbpb.Checked = true;break;
case 0: rbppohne.Checked = true; break;
case 1: rbppa.Checked = true; break;
case 2: rbbpb.Checked = true; break;
}
if (sb.zustaendig == -1)
{
@@ -814,7 +847,7 @@ namespace OnDoc.UIControls
var dataRow = (e.DataRow.RowData as DataRowView).Row;
selectedsbnr = Convert.ToInt32(dataRow["serienbriefnr"].ToString());
}
catch { }
catch { }
}
@@ -915,7 +948,7 @@ namespace OnDoc.UIControls
{
add_progress();
System.Windows.Forms.Application.DoEvents();
dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "'");
dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "' and status<>'1'");
if (dr.Length == 0)
{
dr = sb.dsempfaenger.Tables[0].Select("Partnernr=''");
@@ -958,9 +991,9 @@ namespace OnDoc.UIControls
.Where(gr => gr.Count() > 1)
.Select(g => g.Key);
string check_duplicates = "";
foreach(var dup in duplicates)
foreach (var dup in duplicates)
{
if (check_duplicates!="") { check_duplicates = check_duplicates + ", "; }
if (check_duplicates != "") { check_duplicates = check_duplicates + ", "; }
check_duplicates = check_duplicates + dup.ToString();
}
if (check_duplicates != "")
@@ -974,8 +1007,10 @@ namespace OnDoc.UIControls
if (sb.dsempfaenger.Tables[0].Columns.Count > 20) { check_zwingende_felder(); }
finish_progress();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
if (msg != "") { MessageBox.Show(msg, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
if (msg != "")
{
MessageBox.Show(msg, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
return true;
}
@@ -1024,9 +1059,9 @@ namespace OnDoc.UIControls
System.Data.DataTable vorlagendaten = new System.Data.DataTable();
private void RibbonButtonGenerateSB_Click(object sender, EventArgs e)
{
ribbonbuttonsave_Click(sender, e);
if (!Partnerliste_Pruefen()){ return; }
if (!Partnerliste_Pruefen()) { return; }
Generate();
}
private void Generate(int vorschauid = 0)
@@ -1044,9 +1079,12 @@ namespace OnDoc.UIControls
{
Helper.FileHelper fh = new FileHelper();
sb.VorlageBase64 = fh.Base64FromFile(PreviewFiename);
} else {
string fn = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString(); }
}
else
{
string fn = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString();
}
sb.DocValues = new List<clsDocValue>();
@@ -1405,7 +1443,7 @@ namespace OnDoc.UIControls
}
clsDocValue dv = new clsDocValue();
dv.TMBeginn = beginntextmarke; ;
dv.TMEnd = endetextmarke;
dv.Value = feldwert;
@@ -1601,7 +1639,7 @@ namespace OnDoc.UIControls
{
add_progress();
System.Data.DataRow dr = rowView.Row;
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString()+"'", false, true);
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
if (stream.Length > 0)
{
@@ -1726,7 +1764,7 @@ namespace OnDoc.UIControls
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
{
OnBaseDocUpload.attribute p = new OnBaseDocUpload.attribute(rw["fieldname"].ToString(), rw["fieldvalue"].ToString());
onbasedoc.attributes.Add(p);
@@ -1827,8 +1865,8 @@ namespace OnDoc.UIControls
dB.Exec_SQL("Update edex_sb_serienbrief set aktiv=0, mutiert_am=getdate(),mutierer=" + AppParams.CurrentMitarbieter.ToString() + " where serienbriefnr=" + sb.serienbriefnr.ToString());
dB = null;
enable_disable_functions(1,false);
enable_disable_functions(1, false);
}
@@ -1844,8 +1882,8 @@ namespace OnDoc.UIControls
if (ribbonButtonPartnerPruefen.Enabled) partnerlistePrüfenToolStripMenuItem.Visible = true;
if (RibbonButtonArchivierenUndAbschlessen.Enabled) archivierenUndAbschliessenToolStripMenuItem.Visible = true;
if (ribbonButtonDruckstapel.Enabled) druckstapelAufbereitenToolStripMenuItem.Visible = true;
if (treeViewAdv1.SelectedNode.Text.Substring(0,4)=="Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible)=true;
if (treeViewAdv1.SelectedNode.Text.Substring(0, 4) == "Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible) = true;
}
private void partnerlistePrüfenToolStripMenuItem_Click(object sender, EventArgs e)

View File

@@ -47,7 +47,8 @@
//
// cbboxunterschriftrechts
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
this.cbboxunterschriftrechts.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 62);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
@@ -59,7 +60,8 @@
//
// cbboxunterschriftlinks
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
this.cbboxunterschriftlinks.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 27);
this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks";

View File

@@ -95,7 +95,17 @@ namespace OnDoc.DocMgmt
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftlinks.SelectedValue.ToString();
dr["bewilligt"] = false;
if (Convert.ToInt32(cbboxunterschriftlinks.SelectedValue) == AppParams.CurrentMitarbieter)
{
dr["bewilligt"] = true;
dr["bewilligt_am"] = DateTime.Now;
}
else
{
dr["bewilligt"] = false;
}
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"] = DateTime.Now;

File diff suppressed because it is too large Load Diff

View File

@@ -34,24 +34,31 @@ namespace OnDoc.Helper
}
}
public static void FormatTable(ref DataTable tbl, string tablename, ref SfDataGrid grid)
public static void FormatTable(ref DataTable tbl, string tablename, ref SfDataGrid grid, bool use_sort = true)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from spalten where aktiv=1 and tabelle='" + tablename + "'", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
foreach (DataColumn dc in tbl.Columns)
{
if (dr["tabellenspalte"].ToString() == dc.ColumnName)
{
dc.SetOrdinal(Convert.ToInt32(dr["reihenfolge"].ToString()));
break;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from spalten where aktiv=1 and tabelle='" + tablename + "'", false, true);
if (use_sort)
{
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
foreach (DataColumn dc in tbl.Columns)
{
if (dr["tabellenspalte"].ToString() == dc.ColumnName)
{
if (tablename != "Partner")
dc.SetOrdinal(Convert.ToInt32(dr["reihenfolge"].ToString()));
break;
}
}
tbl.AcceptChanges();
}
tbl.AcceptChanges();
}
grid.DataSource = tbl;
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{

View File

@@ -22,6 +22,7 @@ namespace OnDoc.Klassen
public static string UseAPI { get; set; } = "FALSE";
public static int CurrentMitarbieter { get; set; }
public static string CurrentTGNummer { get; set; } = "";
public static string RESTURI { get; set; } = "";//"http://localhost:2032/";
public static string apikey { get; set; } = "";
@@ -36,6 +37,8 @@ namespace OnDoc.Klassen
public static string ZusatzFont { get; set; } = "";
public static string ZusatzFontSize { get; set; } = "";
public static string EDOKAPath { get; set; } = "";
static AppParams()
{
@@ -64,6 +67,7 @@ namespace OnDoc.Klassen
barcodetextposition = Properties.Settings.Default.BarodeTextPosition;
ZusatzFont = Properties.Settings.Default.ZusatzFont;
ZusatzFontSize = Properties.Settings.Default.ZusatzFontSize;
EDOKAPath=Properties.Settings.Default.edokapath;
}
}
@@ -91,10 +95,17 @@ namespace OnDoc.Klassen
public static string dokumenttypnr { get; set; } = "0";
public static string Interaktion { get; set; } = "Yes";
public static string showdoc { get; set; } = "Yes";
public static string unterschriftenpruefung { get; set; } = "No";
public static Boolean parseparams()
{
if (executed) return false;
string sparam = sourceparam.Substring(sourceparam.IndexOf('?') + 1, sourceparam.Length - (sourceparam.IndexOf('?') + 1));
if (sparam.ToLower() == "ucheck")
{
unterschriftenpruefung = "Yes";
return true;
}
sparam = Uri.UnescapeDataString(sparam);
executed = true;
sourceparam = "";

View File

@@ -16,6 +16,7 @@ namespace OnDoc.Klassen
{
private static string Connectionstring = "";
public static DataTable partnerliste;
public static string tableleyout { get; set; } = "";
public static void set_connectionstring(string connectionstring)
{
Connectionstring = connectionstring;
@@ -32,6 +33,17 @@ namespace OnDoc.Klassen
db.add_parameter("@anz", anzahl.ToString());
db.add_parameter("@fnkt", fnkt.ToString());
partnerliste = db.Get_Tabledata("sp_partner_search", true, false);
//int i = 0;
//foreach (DataColumn dc in partnerliste.Columns)
//{
// dc.SetOrdinal(i);
// i++;
//}
//partnerliste.Columns.Add("Partnerart");
//foreach (System.Data.DataRow row in partnerliste.Rows)
//{
// if (Convert.ToInt32(row[0]) > 999999) { row["Partnerart"] = 2; } else { row["Partnerart"] = 1; }
//}
return partnerliste;
}
finally { db = null; }

View File

@@ -15,13 +15,13 @@ namespace OnDoc.Klassen
public static class clsProcessWatch
{
public static System.Timers.Timer watchtimer = new System.Timers.Timer(2000);
public static System.Timers.Timer watchtimer = new System.Timers.Timer(Convert.ToInt32(Properties.Settings.Default.OfficeWatchTimerIntervall));
static List<FileToCheck> FilestoCheck = new List<FileToCheck>();
public static void AddToList(string dokumentid, string filename, string applicatoin)
public static void AddToList(string dokumentid, string filename, string application)
{
FilestoCheck.Add(new FileToCheck(dokumentid, filename, applicatoin));
FilestoCheck.Add(new FileToCheck(dokumentid, filename, application));
if (watchtimer.Enabled == false) { watchtimer.Enabled = true; }
watchtimer.Elapsed += WatchProcesses;
}
@@ -122,6 +122,7 @@ namespace OnDoc.Klassen
private static bool Check_Modified(FileToCheck fc)
{
DateTime lwt = System.IO.File.GetLastWriteTime(fc.filename);
Logging.DocLog.Debug("Prozesswatch - Check Modified: " + lwt.ToString() + "," + fc.filedatetime.ToString(), "Processwatch", fc.dokumentid, "", fc.filename);
if ((lwt- fc.filedatetime).Seconds > 2)
{
return true;
@@ -147,6 +148,8 @@ namespace OnDoc.Klassen
this.filename = filename;
this.application = application;
this.filedatetime = DateTime.Now;
Logging.DocLog.Debug("Add Processwatch: " + DateTime.Now.ToString(), "New FileToCheck", dokumentid, "", "Add Processwatch");
}
}
}

View File

@@ -44,7 +44,20 @@ namespace OnDoc
if (args[0].ToString().ToUpper().Substring(args[0].ToString().Length - 4, 4) == ".EDK")
{
AppParams.init();
Database.DB db = new Database.DB(AppParams.connectionstring);
string mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
mitarbeiter = mitarbeiter.Replace("i", "");
mitarbeiter = mitarbeiter.Replace("I", "");
mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1);
AppParams.currenttgnummer = mitarbeiter;
db.Get_Tabledata("Select count(*) from ondoc_edk_routing where aktiv=1 and tgnummer='" + AppParams.currenttgnummer + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
System.Diagnostics.Process.Start(AppParams.EDOKAPath, args[0]);
db = null;
System.Environment.Exit(0);
return;
}
string destfile = AppParams.tempdir + DateTime.Now.ToString("yyyyMMddHHmmss") + "_tmpfile.edk";
System.IO.File.Copy(args[0],destfile);
@@ -52,6 +65,7 @@ namespace OnDoc
}
else
{
if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0)
{
AppParams.init();
@@ -81,14 +95,19 @@ namespace OnDoc
//MyForm.runparams();
return;
}
Application.EnableVisualStyles();
SplashScreen sp = new SplashScreen();
sp.Show();
Application.DoEvents();
//Application.SetCompatibleTextRenderingDefault(false);
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("Ngo9BigBOggjHTQxAR8/V1NCaF5cXmZCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdnWXdecXRdQ2heUU13XUI=");
AppParams.init();
// // MyForm = new Start();
// Application.Run(MyForm);
Application.Run(new Start());
}

View File

@@ -260,6 +260,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_16x16_32 {
get {
object obj = ResourceManager.GetObject("Attribut_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_24x24_32 {
get {
object obj = ResourceManager.GetObject("Attribut_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_256x256_32 {
get {
object obj = ResourceManager.GetObject("Attribut_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_32x32_32 {
get {
object obj = ResourceManager.GetObject("Attribut_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Attribut_48x48_32 {
get {
object obj = ResourceManager.GetObject("Attribut_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@@ -1860,6 +1910,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_16x16_32 {
get {
object obj = ResourceManager.GetObject("Person_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_24x24_32 {
get {
object obj = ResourceManager.GetObject("Person_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_256x256_32 {
get {
object obj = ResourceManager.GetObject("Person_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_32x32_32 {
get {
object obj = ResourceManager.GetObject("Person_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Person_48x48_32 {
get {
object obj = ResourceManager.GetObject("Person_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>

View File

@@ -178,6 +178,21 @@
<data name="Approval_OK_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Approval_OK_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Attribut_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Attribut_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Barcode_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Barcode_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -658,6 +673,21 @@
<data name="PDF_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PDF_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Pprofil_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Pprofil_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

View File

@@ -49,7 +49,7 @@ namespace OnDoc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("FilePrintDefault")]
[global::System.Configuration.DefaultSettingValueAttribute("DateiDrukenStandard")]
public string StandardWordDruckMakro {
get {
return ((string)(this["StandardWordDruckMakro"]));
@@ -169,7 +169,7 @@ namespace OnDoc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("14")]
[global::System.Configuration.DefaultSettingValueAttribute("9")]
public string ZusatzFontSize {
get {
return ((string)(this["ZusatzFontSize"]));
@@ -178,5 +178,30 @@ namespace OnDoc.Properties {
this["ZusatzFontSize"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("E:\\Software-Projekte\\EDOKA\\Cleint_Erneuerung_DMS_Framwork48 - Kopie\\EDOKA\\bin\\edo" +
"ka.exe")]
public string edokapath {
get {
return ((string)(this["edokapath"]));
}
set {
this["edokapath"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("5000")]
public string OfficeWatchTimerIntervall {
get {
return ((string)(this["OfficeWatchTimerIntervall"]));
}
set {
this["OfficeWatchTimerIntervall"] = value;
}
}
}
}

View File

@@ -9,7 +9,7 @@
<Value Profile="(Default)">NO</Value>
</Setting>
<Setting Name="StandardWordDruckMakro" Type="System.String" Scope="User">
<Value Profile="(Default)">FilePrintDefault</Value>
<Value Profile="(Default)">DateiDrukenStandard</Value>
</Setting>
<Setting Name="VBVorlagenmanagement" Type="System.String" Scope="User">
<Value Profile="(Default)">Yes</Value>
@@ -39,7 +39,13 @@
<Value Profile="(Default)">Arial</Value>
</Setting>
<Setting Name="ZusatzFontSize" Type="System.String" Scope="User">
<Value Profile="(Default)">14</Value>
<Value Profile="(Default)">9</Value>
</Setting>
<Setting Name="edokapath" Type="System.String" Scope="User">
<Value Profile="(Default)">E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe</Value>
</Setting>
<Setting Name="OfficeWatchTimerIntervall" Type="System.String" Scope="User">
<Value Profile="(Default)">5000</Value>
</Setting>
</Settings>
</SettingsFile>

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

Some files were not shown because too many files have changed in this diff Show More