shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241210

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-10 20:36:02 +01:00
parent 8ade484063
commit 2c42687a40
191 changed files with 71919 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Client/App.config
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>

9
Client/Client.csproj
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>

3
Client/Client.csproj.user
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>

10
Client/Diverses/NativVorlagen.Designer.cs generated
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);

94
Client/Diverses/NativVorlagen.cs
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)

2
Client/Diverses/NativVorlagen.resx
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;
}
}

39
Client/Diverses/SplashScreen.cs Normal file
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();
}
}
}

13243
Client/Diverses/SplashScreen.resx Normal file
View File

File diff suppressed because it is too large Load Diff

92
Client/DocMgmt/Dokumenterstellung.Designer.cs generated
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;
}
}

26
Client/DocMgmt/Dokumenterstellung.cs
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);
}
}
}
}

185
Client/DocMgmt/Serienbrief.cs
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);
@@ -411,7 +441,7 @@ namespace OnDoc.UIControls
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 +463,7 @@ namespace OnDoc.UIControls
panelLoad.Visible = false;
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
else
{
@@ -444,7 +474,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 +485,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 +511,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 +579,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 +610,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 +625,6 @@ namespace OnDoc.UIControls
else { db.save_sb_vorlage_to_db(PreviewFiename, "", sb.serienbriefnr); }
}
private void update_zahlen()
{
try
@@ -605,7 +634,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 +655,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 +673,7 @@ namespace OnDoc.UIControls
catch { }
}
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
update_grid();
@@ -673,7 +704,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.DataSource = dv;
refresh_spalten();
enable_disable_functions(4, false);
break;
case "Gener":
dv.RowFilter = "Status = 1";
@@ -717,7 +748,7 @@ namespace OnDoc.UIControls
System.Windows.Forms.Application.DoEvents();
}
@@ -726,7 +757,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 +773,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 +790,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 +811,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 +846,7 @@ namespace OnDoc.UIControls
var dataRow = (e.DataRow.RowData as DataRowView).Row;
selectedsbnr = Convert.ToInt32(dataRow["serienbriefnr"].ToString());
}
catch { }
catch { }
}
@@ -958,9 +990,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 +1006,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 +1058,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 +1078,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 +1442,7 @@ namespace OnDoc.UIControls
}
clsDocValue dv = new clsDocValue();
dv.TMBeginn = beginntextmarke; ;
dv.TMEnd = endetextmarke;
dv.Value = feldwert;
@@ -1601,7 +1638,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 +1763,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 +1864,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 +1881,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)

12
Client/DocMgmt/frmToApproval.cs
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;

11
Client/Klassen/clsAppParams.cs
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 = "";

9
Client/Klassen/clsProcessWatch.cs
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");
}
}
}

23
Client/Program.cs
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());
}

29
Client/Properties/Settings.Designer.cs generated
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;
}
}
}
}

10
Client/Properties/Settings.settings
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>

27
Client/Start.cs
View File

@@ -197,8 +197,10 @@ namespace OnDoc
private void EDK_Call(string filename)
{
if (dokList1.profilnr == 0) return;
EDK_Data.Load_EDK_File(filename);
DB dB = new DB(AppParams.connectionstring);
EDK_Data.Load_EDK_File(filename);
dB.save_edk(filename, AppParams.CurrentMitarbieter);
System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
@@ -208,7 +210,7 @@ namespace OnDoc
}
private void URI_Call(string filename)
{
if (dokList1.profilnr == 0) return;
if (System.IO.File.Exists(filename))
{
using (StreamReader sr = new StreamReader(filename))
@@ -233,14 +235,27 @@ namespace OnDoc
dokList1.StartPruefung();
return;
}
if (ExternalCall.Interaktion == "Yes")
if (ExternalCall.function.ToLower() == "createdoc")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
if (ExternalCall.Interaktion == "Yes")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
}
else
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr), false, ExternalCall.Interaktion, ExternalCall.showdoc);
}
}
else
if (ExternalCall.function.ToLower() == "createpac")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr), false, ExternalCall.Interaktion, ExternalCall.showdoc);
dokList1.createdocumentpaket(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
}
if (ExternalCall.unterschriftenpruefung == "Yes")
{
dokList1.upruefung();
}
}
}

87
Client/UIControls/Administrator/Dokumenttyp.Designer.cs generated
View File

@@ -60,6 +60,7 @@
this.GrpBewilligung = new System.Windows.Forms.GroupBox();
this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkinterop = new System.Windows.Forms.CheckBox();
this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox();
this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox();
@@ -69,7 +70,6 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.TreeDokumentArt = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.GroupBox2 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.cbaktiv = new System.Windows.Forms.CheckBox();
this.rbDokumenterstellungPerson = new System.Windows.Forms.RadioButton();
this.rbDokumenterstellungBP = new System.Windows.Forms.RadioButton();
@@ -77,6 +77,8 @@
this.cbbezeichnungmutierbar = new System.Windows.Forms.CheckBox();
this.cbVertrag = new System.Windows.Forms.CheckBox();
this.Grp1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxFachverantwortung = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxOwner = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxofficevorlage = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -142,8 +144,6 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.label17 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -156,6 +156,7 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumentArt)).BeginInit();
this.GroupBox2.SuspendLayout();
this.Grp1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).BeginInit();
@@ -172,7 +173,6 @@
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
this.SuspendLayout();
//
// tabControlAdv1
@@ -284,7 +284,6 @@
//
// GrpUnterschrifte
//
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftpruefung);
this.GrpUnterschrifte.Controls.Add(this.lblStandard);
this.GrpUnterschrifte.Controls.Add(this.lbUnterschriftStandard);
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftrechts);
@@ -301,7 +300,7 @@
// cbUnterschriftpruefung
//
this.cbUnterschriftpruefung.AutoSize = true;
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 105);
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19);
this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung";
this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17);
this.cbUnterschriftpruefung.TabIndex = 1;
@@ -363,6 +362,7 @@
//
// GrpBewilligung
//
this.GrpBewilligung.Controls.Add(this.cbUnterschriftpruefung);
this.GrpBewilligung.Controls.Add(this.chkBewilliigungZwingend);
this.GrpBewilligung.Location = new System.Drawing.Point(15, 471);
this.GrpBewilligung.Name = "GrpBewilligung";
@@ -374,12 +374,13 @@
// chkBewilliigungZwingend
//
this.chkBewilliigungZwingend.AutoSize = true;
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(19, 20);
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19);
this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend";
this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17);
this.chkBewilliigungZwingend.TabIndex = 0;
this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend";
this.chkBewilliigungZwingend.UseVisualStyleBackColor = true;
this.chkBewilliigungZwingend.Visible = false;
//
// groupBox4
//
@@ -397,9 +398,17 @@
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(11, 78);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// chkinterop
//
this.chkinterop.Location = new System.Drawing.Point(259, 59);
this.chkinterop.Location = new System.Drawing.Point(11, 59);
this.chkinterop.Name = "chkinterop";
this.chkinterop.Size = new System.Drawing.Size(127, 24);
this.chkinterop.TabIndex = 11;
@@ -407,7 +416,7 @@
//
// chkbearbeitungdirekt
//
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(259, 40);
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 40);
this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt";
this.chkbearbeitungdirekt.Size = new System.Drawing.Size(127, 24);
this.chkbearbeitungdirekt.TabIndex = 10;
@@ -415,7 +424,7 @@
//
// cbbearbeitungzwingend
//
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(259, 19);
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(11, 19);
this.cbbearbeitungzwingend.Name = "cbbearbeitungzwingend";
this.cbbearbeitungzwingend.Size = new System.Drawing.Size(221, 24);
this.cbbearbeitungzwingend.TabIndex = 9;
@@ -424,7 +433,7 @@
//
// cbPDFDirekteArchivierung
//
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(16, 59);
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69);
this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung";
this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24);
this.cbPDFDirekteArchivierung.TabIndex = 8;
@@ -433,19 +442,21 @@
//
// cbPDFDokument
//
this.cbPDFDokument.Location = new System.Drawing.Point(16, 40);
this.cbPDFDokument.Location = new System.Drawing.Point(392, 50);
this.cbPDFDokument.Name = "cbPDFDokument";
this.cbPDFDokument.Size = new System.Drawing.Size(280, 24);
this.cbPDFDokument.TabIndex = 6;
this.cbPDFDokument.Text = "Generierng als PDF";
this.cbPDFDokument.Visible = false;
//
// cbOfficeDokument
//
this.cbOfficeDokument.Location = new System.Drawing.Point(16, 19);
this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29);
this.cbOfficeDokument.Name = "cbOfficeDokument";
this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24);
this.cbOfficeDokument.TabIndex = 4;
this.cbOfficeDokument.Text = "Office-Dokument";
this.cbOfficeDokument.Visible = false;
//
// groupBox3
//
@@ -620,14 +631,6 @@
this.GroupBox2.TabStop = false;
this.GroupBox2.Text = "Diverses";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(259, 78);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// cbaktiv
//
this.cbaktiv.Location = new System.Drawing.Point(293, 53);
@@ -705,6 +708,26 @@
this.Grp1.TabStop = false;
this.Grp1.Text = "Vorlage";
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// cbboxFachverantwortung
//
this.cbboxFachverantwortung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
@@ -1418,26 +1441,6 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1469,6 +1472,7 @@
this.GroupBox2.PerformLayout();
this.Grp1.ResumeLayout(false);
this.Grp1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).EndInit();
@@ -1488,7 +1492,6 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
this.ResumeLayout(false);
}

85
Client/UIControls/Administrator/Dokumenttyp.cs
View File

@@ -149,24 +149,31 @@ namespace OnDoc.UIControls.Administrator
this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true;
this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]);
this.cbboxarchiv.SelectedValue = Convert.ToInt32(r["physisches_archiv"]);
switch (Convert.ToInt32(r["genresultat_type"]))
{
case 1:
cbOfficeDokument.Checked = true;
break;
case 2:
cbPDFDokument.Checked = true;
break;
case 3:
cbPDFDirekteArchivierung.Checked = true;
break;
case 4:
cbbearbeitungzwingend.Checked = true;
break;
default:
cbOfficeDokument.Checked = true;
break;
}
//this.cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitungzwingend"]) == true;
//switch (Convert.ToInt32(r["genresultat_type"]))
//{
// case 1:
// cbOfficeDokument.Checked = true;
// break;
// case 2:
// cbPDFDokument.Checked = true;
// break;
// case 3:
// cbPDFDirekteArchivierung.Checked = true;
// break;
// case 4:
// cbbearbeitungzwingend.Checked = true;
// break;
// default:
// cbOfficeDokument.Checked = true;
// break;
//}
try { chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true; } catch { chkbearbeitungdirekt.Checked = false; }
try { chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true; }catch { chkinterop.Checked = false; }
try { chkboxInOffice.Checked = Convert.ToBoolean(r["erstellungInOffice"]) == true; } catch { chkboxInOffice.Checked = false; };
try { cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitung_zwingend"]) == true; } catch { cbbearbeitungzwingend.Checked = false; }
r["physisches_archiv"] = cbboxarchiv.SelectedValue;
this.cbversandstrasse_moeglich.Checked = r["versandstrasse_moeglich"].ToString() == "True";
this.cbebanking_moeglich.Checked = r["ebanking_moeglich"].ToString() == "True";
@@ -175,23 +182,23 @@ namespace OnDoc.UIControls.Administrator
this.listBox1.DataSource = db.dsdaten.Tables[0];
this.listBox1.DisplayMember = "Bezeichnung";
this.listBox1.ValueMember = "vorlagenfeldregelnr";
try
{
chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
}
catch { chkbearbeitungdirekt.Checked = false; }
try
{
chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
}
catch { chkinterop.Checked = false; }
//try
//{
// chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
//}
//catch { chkbearbeitungdirekt.Checked = false; }
//try
//{
// chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
//}
//catch { chkinterop.Checked = false; }
try
{
chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
}
catch
{ chkboxInOffice.Checked = false; }
//try
//{
// chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
//}
//catch
//{ chkboxInOffice.Checked = false; }
Update_Vorlagenfelder();
}
@@ -340,11 +347,11 @@ namespace OnDoc.UIControls.Administrator
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
r["[physisches_archiv]"]=cbboxarchiv.SelectedValue;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
if (cbbearbeitungzwingend.Checked) { r["genresultat_type"] = 4; }
r["physisches_archiv"]=cbboxarchiv.SelectedValue;
//if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
//if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
//if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
r["bearbeitung_zwingend"] = this.cbbearbeitungzwingend.Checked == true;

4
Client/UIControls/Administrator/edk_viewer.cs
View File

@@ -59,7 +59,7 @@ namespace OnDoc.UIControls.Administrator
}
else
{
sql = "select top "+numericUpDown1.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = sql + " where insert_timestamp >= '" + datum + "' ";
if (mitarbeiternr > 0)
@@ -69,7 +69,7 @@ namespace OnDoc.UIControls.Administrator
sql = sql + " where tgnummer='" + db.dsdaten.Tables[0].Rows[0][0].ToString() + "'";
}
}
sql = sql + "order by rowid desc";
sql = sql + " order by rowid desc";
}
db.Get_Tabledata(sql, false, true);

2
Client/UIControls/Approval.cs
View File

@@ -147,7 +147,7 @@ namespace OnDoc.UIControls
}
else
{
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString());
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
if (tp.Nodes.Count < 1)
{

90
Client/UIControls/DocPreview.Designer.cs generated
View File

@@ -35,19 +35,19 @@
this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl();
this.pnlEdit = new System.Windows.Forms.Panel();
this.Open = new System.Windows.Forms.ToolStrip();
this.txtPageNumber = new System.Windows.Forms.ToolStripTextBox();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.zoomComboBox = new System.Windows.Forms.ToolStripComboBox();
this.panel1 = new System.Windows.Forms.Panel();
this.btnFirst = new System.Windows.Forms.ToolStripButton();
this.btnPrevious = new System.Windows.Forms.ToolStripButton();
this.txtPageNumber = new System.Windows.Forms.ToolStripTextBox();
this.btnNext = new System.Windows.Forms.ToolStripButton();
this.btnLast = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.zoomIn = new System.Windows.Forms.ToolStripButton();
this.zoomOut = new System.Windows.Forms.ToolStripButton();
this.zoomComboBox = new System.Windows.Forms.ToolStripComboBox();
this.FitPage = new System.Windows.Forms.ToolStripButton();
this.FitWidth = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.panel1 = new System.Windows.Forms.Panel();
this.Open.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -127,46 +127,6 @@
this.Open.TabIndex = 5;
this.Open.Text = "toolStrip1";
//
// txtPageNumber
//
this.txtPageNumber.AutoSize = false;
this.txtPageNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtPageNumber.Font = new System.Drawing.Font("Segoe UI", 9F);
this.txtPageNumber.Name = "txtPageNumber";
this.txtPageNumber.Size = new System.Drawing.Size(35, 23);
this.txtPageNumber.Text = "1";
this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// zoomComboBox
//
this.zoomComboBox.Items.AddRange(new object[] {
"50%",
"75%",
"100%",
"125%",
"150%",
"200%",
"400%"});
this.zoomComboBox.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomComboBox.Name = "zoomComboBox";
this.zoomComboBox.Size = new System.Drawing.Size(75, 31);
this.zoomComboBox.Text = "100%";
this.zoomComboBox.SelectedIndexChanged += new System.EventHandler(this.zoomComboBox_SelectedIndexChanged);
//
// panel1
//
this.panel1.Controls.Add(this.Open);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(76, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(781, 41);
this.panel1.TabIndex = 6;
//
// btnFirst
//
this.btnFirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -193,6 +153,16 @@
this.btnPrevious.ToolTipText = "Vorherige Seite";
this.btnPrevious.Click += new System.EventHandler(this.btnPrevious_Click);
//
// txtPageNumber
//
this.txtPageNumber.AutoSize = false;
this.txtPageNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtPageNumber.Font = new System.Drawing.Font("Segoe UI", 9F);
this.txtPageNumber.Name = "txtPageNumber";
this.txtPageNumber.Size = new System.Drawing.Size(35, 23);
this.txtPageNumber.Text = "1";
this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btnNext
//
this.btnNext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -219,6 +189,11 @@
this.btnLast.ToolTipText = "Letzte Seite";
this.btnLast.Click += new System.EventHandler(this.btnLast_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// zoomIn
//
this.zoomIn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -243,6 +218,22 @@
this.zoomOut.ToolTipText = "Vergrössern";
this.zoomOut.Click += new System.EventHandler(this.zoomOut_Click);
//
// zoomComboBox
//
this.zoomComboBox.Items.AddRange(new object[] {
"50%",
"75%",
"100%",
"125%",
"150%",
"200%",
"400%"});
this.zoomComboBox.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomComboBox.Name = "zoomComboBox";
this.zoomComboBox.Size = new System.Drawing.Size(75, 31);
this.zoomComboBox.Text = "100%";
this.zoomComboBox.SelectedIndexChanged += new System.EventHandler(this.zoomComboBox_SelectedIndexChanged);
//
// FitPage
//
this.FitPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -277,9 +268,18 @@
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(28, 28);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Text = "PDF Drucken";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// panel1
//
this.panel1.Controls.Add(this.Open);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(76, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(781, 41);
this.panel1.TabIndex = 6;
//
// DocPreview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

6
Client/UIControls/DocPreview.cs
View File

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using Database;
using System.Linq.Expressions;
using System.Web.Security;
namespace OnDoc.UIControls
{
@@ -269,5 +270,10 @@ namespace OnDoc.UIControls
{
pdfViewerControl1.Print(true);
}
public void printpdf()
{
pdfViewerControl1.Print(true);
}
}
}

34
Client/UIControls/DocPreview.resx
View File

@@ -132,10 +132,10 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADVSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGygyyC2u
1NEtvuwJSC9ZBtnb17MA1bfZh+X9hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3
1NEtvuwJSC9ZBtnb17MA1bfZh+b+hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3
CFktOiZokEdChalrfPkdZHXYMF6DXGLL5XB5BR0TdlFipZZbbMklZHXYMFFhZB9fzwH03mRkteiYKINg
wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eLzflNkEAwgJw2KDAIBSGItXwQA
J9Qz8tyQmCQAAAAASUVORK5CYII=
wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eJzf1NkEAwgJw2KDAIBSGItXwQA
IEsz79EkZgAAAAAASUVORK5CYII=
</value>
</data>
<data name="btnPrevious.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -143,8 +143,8 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACzSURBVDhPYyAFeMWXSLjFlW2FcgkDt/jyYLf4ojdA+j9U
CDdwSSvnd40rXwRSDMNQKezALa7U0TGm7BGyBpya7OPrOdziy/qACv6hawBhqDIEcI4tN3SNK7uKTTEM
Q5UyMISGhjK7xJVXucXn/camEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk
QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCkPg6mmNw2kwAAAABJRU5ErkJggg==
Q5UyMISGhjK7xJVXucXn/samEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk
QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCgdQ6kWu3sLwAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -152,39 +152,39 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACeSURBVDhPY3CNLd3iFV8iwUAKcIsv/w/Er90TyoKgQoQB
VBMYu8aXLfSIrueDSuEGyJoguOihe3y5A1QaO8DUBMb/gLjXPr6eA6oMFaApRsEu8eVXXONLDKBKEQCb
YhQcVv7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0
TMjAAAAG+g6sHS8nigAAAABJRU5ErkJggg==
YhQcWv7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0
TMjAAAADTw6q3g6ecAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnLast.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADaSURBVDhPY3CNK1/kl1TKy0AiAOp74BZf/h+GGUCEa3z5
HY+EClOoGqIAVoMgOO+3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA
HY+EClOoGqIAVoMgOPe3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA
sJtsH1/PAdWLAkgyCIxjSy55JFZqQfXDAekGAbFLRPknl9hyOagZYECyQbiSBmlhhCexEmUQyCtuCWVR
UD1YAREGlZ1wTqxQgqrHCXAaZB+W9xdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA
alD5fwDu3zPxKNmfQgAAAABJRU5ErkJggg==
UD1YAREGlZ1wTqxQgqrHCXAaZB+a+xdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA
alD5fwDplDPuaUZeUwAAAABJRU5ErkJggg==
</value>
</data>
<data name="zoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/0GYTAb
JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2YXl/sWnEhsFqgXqg2iHANa48EJti
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/4GYTAb
JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2obl/sWnEhsFqgXqg2iHANa48EJti
YjBIL9gQ+/h8Aafo4lfYFBGDQXpBZjAAObnokmTgXAaXuPJDWCRIwiAzQC76hizoHl/uQAxG1gPE30AG
IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgA/mnxXG9M
KfwAAAAASUVORK5CYII=
IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgA4VXxUAJa
VPcAAAAASUVORK5CYII=
</value>
</data>
<data name="zoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/0GYTAb
JAaUA6mBKscO3GMrXFzjy++4xZf/x4ed40tug9RCtaECoG2Z9mF5f7FpxIbBaoF6oNohwDWuPBCr4viy
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/4GYTAb
JAaUA6mBKscO3GMrXFzjy++4xZf/x4ed40tug9RCtaECoG2Z9qG5f7FpxIbBaoF6oNohwDWuPBCr4viy
j85xJRdAGMTGpgakF2yIfXy+gFN08SusiuJLN4AVAQGIjU0NSC/IDAYgJxddEoaJMQiKcxlc4soPYZEA
Y2INApkBctE3ZEH3+HIHGHaNqdSBmsMAYiPLIesB4m8gg5AF/kP1EQQY+oAEiotc40sM4DimWBGqD+ii
YkVkOWQ9QPyNqmFEnVijWjoCK8KRst3ii94A6QMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+
fLVbfNkT4sojBgYA29fNZohv9VsAAAAASUVORK5CYII=
fLVbfNkT4sojBgYAvsPNWp0R0zgAAAAASUVORK5CYII=
</value>
</data>
<data name="FitPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

47
Client/UIControls/DokList.Designer.cs generated
View File

@@ -135,13 +135,14 @@ namespace OnDoc.UICintrols
this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
this.lblToApprove = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -598,6 +599,7 @@ namespace OnDoc.UICintrols
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32;
this.ribbonButtonVersandstrasse.Text = "Versandstrasse";
this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click);
//
// RibbonPanelDemo
@@ -1107,6 +1109,31 @@ namespace OnDoc.UICintrols
this.ribbonButtonSysadmins.Text = "Sys-Admins";
this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click);
//
// ribbonPanel1
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image")));
this.ribbonbuttonedklog.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.LargeImage")));
this.ribbonbuttonedklog.Name = "ribbonbuttonedklog";
this.ribbonbuttonedklog.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.SmallImage")));
this.ribbonbuttonedklog.Text = "EDK-DATA/-LOG";
this.ribbonbuttonedklog.Click += new System.EventHandler(this.ribbonbuttonedklog_Click);
//
// ribbonbuttonedkverarbeitung
//
this.ribbonbuttonedkverarbeitung.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.Image")));
this.ribbonbuttonedkverarbeitung.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.LargeImage")));
this.ribbonbuttonedkverarbeitung.Name = "ribbonbuttonedkverarbeitung";
this.ribbonbuttonedkverarbeitung.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.SmallImage")));
this.ribbonbuttonedkverarbeitung.Text = "EDK OnDoc_EDOKA";
this.ribbonbuttonedkverarbeitung.Click += new System.EventHandler(this.ribbonbuttonedkverarbeitung_Click);
//
// lblToApprove
//
this.lblToApprove.AutoSize = true;
@@ -1139,21 +1166,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// ribbonPanel1
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image")));
this.ribbonbuttonedklog.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.LargeImage")));
this.ribbonbuttonedklog.Name = "ribbonbuttonedklog";
this.ribbonbuttonedklog.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.SmallImage")));
this.ribbonbuttonedklog.Text = "EDK-DATA/-LOG";
this.ribbonbuttonedklog.Click += new System.EventHandler(this.ribbonbuttonedklog_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1293,5 +1305,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonButton ribbonButtonSysadmins;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonbuttonedklog;
private System.Windows.Forms.RibbonButton ribbonbuttonedkverarbeitung;
}
}

141
Client/UIControls/DokList.cs
View File

@@ -119,7 +119,8 @@ namespace OnDoc.UICintrols
db = null;
refresh_ansichten();
}
private void refresh_ansichten(string Bezeichnung="") {
private void refresh_ansichten(string Bezeichnung = "")
{
ribbonCBAnsicht.DropDownItems.Clear();
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
@@ -133,7 +134,7 @@ namespace OnDoc.UICintrols
rl.Text = dr["bezeichnung"].ToString();
rl.Tag = Convert.ToInt32(dr["id"]);
ribbonCBAnsicht.DropDownItems.Add(rl);
if (Convert.ToBoolean(dr["standard"])==true && Bezeichnung=="")
if (Convert.ToBoolean(dr["standard"]) == true && Bezeichnung == "")
{
ribbonCBAnsicht.SelectedItem = rl;
standardview = dr["gridsettings"].ToString();
@@ -177,7 +178,7 @@ namespace OnDoc.UICintrols
}
catch { }
}
public void refresh_dokumente(string layout="")
public void refresh_dokumente(string layout = "")
{
if (datafilter != "")
{
@@ -193,16 +194,16 @@ namespace OnDoc.UICintrols
System.Data.DataTable dokumente = new System.Data.DataTable();
dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false);
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
if (layout=="") { layout = "trefferliste_relaunch"; }
if (layout == "") { layout = "trefferliste_relaunch"; }
TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1);
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
}
public void refresh_dokumente_filtered(string layout="")
public void refresh_dokumente_filtered(string layout = "")
{
DB db = new DB(AppParams.connectionstring);
int selectedIndex = RibbonCBProfil.SelectedIndex;
@@ -210,7 +211,7 @@ namespace OnDoc.UICintrols
{
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
}
catch
catch
{
load_Profile();
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
@@ -227,7 +228,7 @@ namespace OnDoc.UICintrols
}
private void update_ansicht (string bearbeitung_zwingend, string toApprove, string approved)
private void update_ansicht(string bearbeitung_zwingend, string toApprove, string approved)
{
if (dokwerte1.Width > 0)
{
@@ -276,7 +277,7 @@ namespace OnDoc.UICintrols
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[columnIndex].ToString();
selected_cellvalue=this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
selected_cellvalue = this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
update_ansicht(dataRow["Bearbeitung_Zwingend"].ToString(), dataRow["toapprove"].ToString(), dataRow["approved"].ToString());
return;
@@ -333,10 +334,21 @@ namespace OnDoc.UICintrols
private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
dokument_bearbeiten();
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1) {
if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?","Dokument bearbeiten",MessageBoxButtons.YesNo,MessageBoxIcon.Question) != DialogResult.Yes) { return; }
}
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid);
}
}
public void dokument_bearbeiten()
public void dokument_bearbeiten(string dokid)
{
if (dokid != "") { selected_dokumentid = dokid; }
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
DB db = new DB(AppParams.connectionstring);
@@ -596,7 +608,7 @@ namespace OnDoc.UICintrols
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
@@ -609,7 +621,7 @@ namespace OnDoc.UICintrols
else { return; }
}
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
@@ -634,7 +646,7 @@ namespace OnDoc.UICintrols
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
dokument_bearbeiten();
dokument_bearbeiten(selected_dokumentid);
}
break;
case 2:
@@ -764,12 +776,12 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Visible = false;
this.sfDataGrid1.ShowGroupDropArea = false;
this.RibbonPannelAnsicht.Visible = false;
}
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
@@ -798,11 +810,12 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
if (dataRow[11].ToString() != "True")
Logging.Logging.Debug("IdonHandler", "OnDocClient", dataRow["dokumentid"].ToString() + Convert.ToString(dataRow["Bearbeitung_Zwingend"]));
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"])== false)
{
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["ToApprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -824,10 +837,10 @@ namespace OnDoc.UICintrols
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (dataRow[11].ToString() != "True")
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false)
if (Convert.ToBoolean(dataRow["toapprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -871,11 +884,52 @@ namespace OnDoc.UICintrols
private void druckenToolStripMenuItem_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) drucken", "Dokument drucken", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
print_doc(documentid);
}
Cursor = Cursors.Default;
}
private void print_doc(string dokumentid)
{
DocGet gd = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok("", "", "");
dok = gd.GetDoc(selected_dokumentid);
gd.Print_Doc(dok.dokument);
dok = gd.GetDoc(dokumentid);
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = "";
switch (dok.doktype)
{
case "D":
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
System.IO.File.Delete(Filename);
op = null;
break;
case "X":
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
break;
case "P":
DocPreview docPreview = new DocPreview();
docPreview.Show_Doc(dokumentid);
docPreview.printpdf();
docPreview.Dispose();
break;
default:
break;
}
fh = null;
gd = null;
}
private void RibbonButtonTest1_Click(object sender, EventArgs e)
@@ -969,6 +1023,7 @@ namespace OnDoc.UICintrols
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) archiviern und abschliessen", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
@@ -978,6 +1033,7 @@ namespace OnDoc.UICintrols
archivedoc(documentid);
}
Cursor = Cursors.Default;
refresh_dokumente();
// return;
@@ -1069,6 +1125,14 @@ namespace OnDoc.UICintrols
fa.ShowDialog();
}
public void upruefung()
{
Refresh_Bewilligungen();
if (this.lblToApprove.Text == "") { MessageBox.Show("Es stehen keine Dokumente zur Unterschriftenprüfung an.", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
frmBewilligung bw = new frmBewilligung();
bw.Show();
}
private void Refresh_Bewilligungen()
{
DB db = new DB(AppParams.connectionstring);
@@ -1145,7 +1209,7 @@ namespace OnDoc.UICintrols
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
{
}
//pos_elements();
}
@@ -1267,7 +1331,7 @@ namespace OnDoc.UICintrols
//tagesdatum = "2024-11-29T00:00:00";
plaintext = plaintext.Replace("@today@", tagesdatum);
plaintext = Strings.Base64Encode(plaintext);
bytes=Convert.FromBase64String(plaintext);
bytes = Convert.FromBase64String(plaintext);
using (MemoryStream ms = new MemoryStream(bytes))
{
this.sfDataGrid1.Deserialize(ms);
@@ -1276,6 +1340,7 @@ namespace OnDoc.UICintrols
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
}
@@ -1358,7 +1423,7 @@ namespace OnDoc.UICintrols
}
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard) values(";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "',"+sa.alsStandard.ToString()+")";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString() + ")";
db.Exec_SQL(sql);
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
@@ -1373,7 +1438,9 @@ namespace OnDoc.UICintrols
private void RibbonButtonViewDelete_Click(object sender, EventArgs e)
{
if (ribbonCBAnsicht.SelectedItem.Text.Trim()=="" || ribbonCBAnsicht.SelectedItem.Text.Substring(0,4)==" Heu")
string bez = ribbonCBAnsicht.SelectedItem.Text.Trim();
if (bez.Length < 4) { bez = bez + " "; }
if (bez == "" || bez == " Heu")
{
MessageBox.Show("Die gewählte Standard-Ansicht kann nicht gelöscht werden", "Ansicht löschen", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -1399,7 +1466,7 @@ namespace OnDoc.UICintrols
FileHelper fh = new FileHelper();
string b = fh.Base64FromFile(@"x:\gridsettings2.xml");
DB db = new DB(AppParams.connectionstring);
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100");
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
@@ -1428,7 +1495,7 @@ namespace OnDoc.UICintrols
if (dokwerte1.Width == 0)
{
dokwerte1.Width = 300;
dokwerte1.set_panelheight( sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.Update_Werte(selected_dokumentid);
}
@@ -1454,7 +1521,6 @@ namespace OnDoc.UICintrols
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
@@ -1507,7 +1573,8 @@ namespace OnDoc.UICintrols
selected_dokumentid = "";
selected_partnernr = "";
selected_cellvalue = "";
} else
}
else
{
RibbonButtonEditEditDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
@@ -1528,10 +1595,10 @@ namespace OnDoc.UICintrols
selected_partnernr = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "partner-nr").ToString();
selected_cellvalue = selected_dokumentid;
string bearbeitung_zwingend= sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string bearbeitung_zwingend = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString();
string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString();
update_ansicht(bearbeitung_zwingend,toapprove,approved);
update_ansicht(bearbeitung_zwingend, toapprove, approved);
}
}
@@ -1597,6 +1664,12 @@ namespace OnDoc.UICintrols
edk_viewer ev = new edk_viewer();
ev.Show();
}
private void ribbonbuttonedkverarbeitung_Click(object sender, EventArgs e)
{
TableEditor tb = new TableEditor("OnDoc_EDK_Routing");
tb.Show();
}
}
}

39
Client/UIControls/DokList.resx
View File

@@ -506,40 +506,55 @@
<data name="ribbonButtonSysadmins.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedklog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

34
Client/UIControls/Dokwerte.Designer.cs generated
View File

@@ -31,8 +31,12 @@
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.grppruefung = new System.Windows.Forms.GroupBox();
this.sfdatagridpruefung = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.panel1.SuspendLayout();
this.grppruefung.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfdatagridpruefung)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
@@ -42,7 +46,7 @@
this.sfDataGrid1.Location = new System.Drawing.Point(0, 100);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(381, 611);
this.sfDataGrid1.Size = new System.Drawing.Size(381, 421);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.Text = "sfDataGrid1";
this.sfDataGrid1.CopyCellContent += new Syncfusion.WinForms.DataGrid.Events.CellCutCopyPasteEventHandler(this.sfDataGrid1_CopyCellContent);
@@ -67,17 +71,43 @@
this.label1.TabIndex = 0;
this.label1.Text = "Attribute";
//
// grppruefung
//
this.grppruefung.Controls.Add(this.sfdatagridpruefung);
this.grppruefung.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grppruefung.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.grppruefung.Location = new System.Drawing.Point(0, 521);
this.grppruefung.Name = "grppruefung";
this.grppruefung.Size = new System.Drawing.Size(381, 190);
this.grppruefung.TabIndex = 2;
this.grppruefung.TabStop = false;
this.grppruefung.Text = "Prüfung";
//
// sfdatagridpruefung
//
this.sfdatagridpruefung.AccessibleName = "Table";
this.sfdatagridpruefung.BackColor = System.Drawing.SystemColors.Window;
this.sfdatagridpruefung.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfdatagridpruefung.Location = new System.Drawing.Point(3, 16);
this.sfdatagridpruefung.Name = "sfdatagridpruefung";
this.sfdatagridpruefung.Size = new System.Drawing.Size(375, 171);
this.sfdatagridpruefung.TabIndex = 0;
this.sfdatagridpruefung.Text = "sfDataGrid2";
//
// Dokwerte
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.sfDataGrid1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.grppruefung);
this.Name = "Dokwerte";
this.Size = new System.Drawing.Size(381, 711);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.grppruefung.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfdatagridpruefung)).EndInit();
this.ResumeLayout(false);
}
@@ -87,5 +117,7 @@
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox grppruefung;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridpruefung;
}
}

22
Client/UIControls/Dokwerte.cs
View File

@@ -44,10 +44,28 @@ namespace OnDoc.UIControls
db.add_parameter("@dokumentid", dokumentid);
db.Get_Tabledata("sp_ondoc_get_dokumentdetails", true, false);
this.sfDataGrid1.DataSource = db.dsdaten.Tables[0];
db = null;
sfDataGrid1.Columns[0].Width = 120;
sfDataGrid1.Columns[1].Width = 170;
db.Get_Tabledata("Select * from dokumentbewilligung where aktiv=1 and dokumentid='" + dokumentid + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
this.grppruefung.Height = this.Height = 150;
sfdatagridpruefung.DataSource=db.dsdaten.Tables[0];
for (int i = 3; i < sfdatagridpruefung.ColumnCount; i++)
{
sfdatagridpruefung.Columns[i].Visible = false;
}
sfdatagridpruefung.Columns[2].Width = 80;
sfdatagridpruefung.Columns[1].Width = 80;
sfdatagridpruefung.Columns[0].Width = sfdatagridpruefung.Width - 170;
}
else
{
this.grppruefung.Height = 0;
}
db = null;
}
private void sfDataGrid1_KeyUp(object sender, KeyEventArgs e)

BIN
Client/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

12
Client/bin/Debug/OnDoc.exe.config
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>

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
931b0c7dd69587e134eaad161e787b8964978bb6a406bb6e76682ec4df0de556
270bbf90fe53a42fd6861f8675c74b142541c27c71ac5fd345ee101d7df54cce

1
Client/obj/Debug/Client.csproj.FileListAbsolute.txt
View File

@@ -254,3 +254,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.SaveAnsicht.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Dokwerte.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.edk_viewer.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.SplashScreen.resources

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Diverses.NativVorlagen.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Diverses.SplashScreen.resources Normal file
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UICintrols.DokList.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UIControls.DocPreview.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

12
Client/obj/Debug/OnDoc.exe.config
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>

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Release/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.