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

update 20250219

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-19 18:10:21 +01:00
parent d0d96c0732
commit 8bd079b635
82 changed files with 921 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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>ondoc::%3ffunktion=openclient</StartArguments>
<StartArguments>
</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(177, 26);
this.label2.TabIndex = 2;
this.label2.Text = "14. Februar 2025";
this.label2.Text = "19. Februar 2025";
//
// SplashScreen
//

2
Client/DocMgmt/DokTypFavoritenOrdner.Designer.cs generated
View File

@@ -160,7 +160,7 @@
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(171, 23);
this.button1.TabIndex = 1;
this.button1.Text = "Gewählte Vorlge zuordnen";
this.button1.Text = "Gewählte Vorlage zuordnen";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//

9
Client/DocMgmt/DokTypSelect.cs
View File

@@ -32,6 +32,7 @@ namespace OnDoc.DocMgmt
public int type { get; set; } = 1;
private Boolean dragSender_Favoriten = false;
private int SaveFormWidth = 515;
//0="Einzelvorlagen"
//1="Dokumentpaket"
@@ -46,6 +47,7 @@ namespace OnDoc.DocMgmt
new QueryAllowedPositionsEventHandler(this.TreeDragDrop_QueryAllowedPositionsForNode1);
this.treeViewDragHighlightTracker1.QueryDragInsertInfo +=
new QueryDragInsertInfoEventHandler(treeViewDragHighlightTracker_QueryDragInsertInfo1);
}
public DokTypSelect(bool favoriten)
@@ -79,7 +81,7 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("select distinct fachverantwortung from dbo.view_dokumenttypen_relaunch order by fachverantwortung asc", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
@@ -611,12 +613,14 @@ namespace OnDoc.DocMgmt
grpVorlagen.Visible = true;
grpFavoriten.Visible = false;
grpVorlagen.Dock = DockStyle.Fill;
this.Width = SaveFormWidth;
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = false;
grpFavoriten.Visible = true;
grpFavoriten.Dock = DockStyle.Fill;
this.Width = SaveFormWidth; ;
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == false)
{
@@ -630,7 +634,8 @@ namespace OnDoc.DocMgmt
grpFavoriten.Visible = true;
grpVorlagen.Dock = DockStyle.Left;
grpFavoriten.Dock = DockStyle.Left;
grpVorlagen.Width = this.Width / 2;
//grpVorlagen.Width = this.Width / 2;
this.Width = SaveFormWidth * 2;
grpFavoriten.Width = grpVorlagen.Width;
}

106
Client/DocMgmt/DokTypSelect.resx
View File

@@ -282,59 +282,59 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
DAAAAk1TRnQBSQFMAgEBBgEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAEBcCAAHcChkBCQH0
IQAQFwIAAQkKAAH0AfMhAAIXDQABFwIAAQkGAAHWAgkB8QH0AfMhAAIXAQACFwoAARcCAAEJCgAB9AHz
IQACFwEAAxcGAAIXAQABFwIAAQkBAAjWAfEB9AHzIQACFwMAAhcEAAEXAQABFgEAARcCAAEJCgAB9AHz
IQACFwQAARcBFgYXAQABFwIAAQkBAAgJAfIB9AHzIQACFwUAARcBAAEXBQABFwIAAQkKAAH0AfMhAAIX
BQACFwYAARcCAAEJAQAICQHzAfQB8yEAAhcGAAEXBgABFwIAAQkKAAH0AfMhAAIXBQACFwYAARcCAAEJ
AQAICQHzAfQB8yEAAhcFAAIXBgABFwIAAQkHAAG8AhkBCQHzIQACFwUAAhcGAAEXAgABCQEABhkECSIA
AhcGAAEXBgABFwIAAQkHAAIJAdwjABAXAgABCQcAAQkB3CQAEBcCAAHxCAk3AAH/CvIB/wIAELIQcAH/
AcMMmgHDAf8CAAHyAQcI8gEHAfICABCyEHAB9A16AVkB9AIAAvIIAALyAgACsg0AAbICcA0AAXAB9A16
AVkBwwIAAvIIAALyAgACsg0AAbICcA0AAXAB9A16AVkBwwIAAvIBAAbvAQAC8gIAArIDAAKyAgABtAKy
AwABsgJwAgADcAMAAnADAAFwAfQNegFZAcMCAALyAQAG7wEAAvICAAKyAgAB8gKyAQkBAAOyAwABsgJw
AwADcAEAA3ADAAFwAfQNegFZAcMCAALyAQAG7wEAAvICAAKyAgAEsgEAA7IB3QIAAbICcAQABXAEAAFw
AfQNegFZAcMCAALyAQAG7wEAAvICAAKyAgACsgG0AbIBGQGyAQACsgIAAbICcAUAA3AFAAFwAfQNegFZ
AcMCAALyAgAB8AEAAfIC7wEAAvICAAKyAgABsgEZAQADsgEAArICAAGyAnAFAANwBQABcAH0DXoBWQHD
AgAC8gIAAe8BAAHyAu8BAALyAgACsgEAArICAAOyAgABsgHzAQABsgJwBAAFcAQAAXAB9A1ZATgB9AIA
AvICAAHvAQAB8gLvAQAC8gIAArIBAAKyAgABCQGyAwACsgEAAbICcAMAA3ABAANwAwABcAHDDjgB9gIA
AvIBAAPtAfIC7wEAAvICAAKyDQABsgJwAwACcAMAAnADAAFwAcMGOAFZBvQB9gMAAvIIAAHxAfMCAAKy
DQABsgJwDQABcAH0BjgBvQoAAvIHAAH0Ae8B/wIAArINAAGyAnANAAFwAf8BwwSaAb0B/woAAfIBBwby
AfEB7wH/AwAQshBwEgAB/wfyAfMB/wQAELIQcAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYA
AQEWAAP/AwABwAEBBgAB3wH5BAABPwH+Ad8BgQQAAScB/gHfAfkEAAEjAfIB0AEBBAABOQHqAd8B+QQA
ATwBAgHQAQEEAAE+Ab4B3wH5BAABPgF+AdABAQQAAT8BfgHfAfkEAAE+AX4B0AEBBAABPgF+Ad8BwQQA
AT4BfgHQAQMEAAE/AX4B3wHHBgAB3wHPBgABwAEfBAAC/wHAAQMGAAHAAQMGAAHPAfMBPwH+AT8B/gIA
Ac8B8wE/Af4BPwH+AgAByAETATkBjgExAc4CAAHIARMBMAGOATgBjgIAAcgBEwEwAYYBPAEeAgAByAET
ATABJgI+AgABzQETATIBJgI+AgABzQETASYBMgE8AR4CAAHNARMBJgFyATgBjgIAAcgBEwE/Af4BOQHO
AQABAQHPAfMBPwH+AT8B/gEAAf8BzwHjAT8B/gE/Af4BAAH/AcABBwQAAv8BwAEPBAAL
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAg
DAAAAk1TRnQBSQFMAgEBBgIAAQEBAAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
AUADAAEgAwABAQEAAQgGAAEIGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ
AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm
AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz
AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm
AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm
AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA
ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm
AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm
ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm
AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA
AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ
AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz
AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/
AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA
AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM
AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm
ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ
AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/
ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM
ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm
AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM
AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA
AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA
ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7
Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8BABAXAgAB3AoZAQkB9CEA
EBcCAAEJCgAB9AHzIQACFw0AARcCAAEJBgAB1gIJAfEB9AHzIQACFwEAAhcKAAEXAgABCQoAAfQB8yEA
AhcBAAMXBgACFwEAARcCAAEJAQAI1gHxAfQB8yEAAhcDAAIXBAABFwEAARYBAAEXAgABCQoAAfQB8yEA
AhcEAAEXARYGFwEAARcCAAEJAQAICQHyAfQB8yEAAhcFAAEXAQABFwUAARcCAAEJCgAB9AHzIQACFwUA
AhcGAAEXAgABCQEACAkB8wH0AfMhAAIXBgABFwYAARcCAAEJCgAB9AHzIQACFwUAAhcGAAEXAgABCQEA
CAkB8wH0AfMhAAIXBQACFwYAARcCAAEJBwABvAIZAQkB8yEAAhcFAAIXBgABFwIAAQkBAAYZBAkiAAIX
BgABFwYAARcCAAEJBwACCQHcIwAQFwIAAQkHAAEJAdwkABAXAgAB8QgJNwAB/wryAf8CABCyEHAB/wHD
DJoBwwH/AgAB8gEHCPIBBwHyAgAQshBwAfQNegFZAfQCAALyCAAC8gIAArINAAGyAnANAAFwAfQNegFZ
AcMCAALyCAAC8gIAArINAAGyAnANAAFwAfQNegFZAcMCAALyAQAG7wEAAvICAAKyAwACsgIAAbQCsgMA
AbICcAIAA3ADAAJwAwABcAH0DXoBWQHDAgAC8gEABu8BAALyAgACsgIAAfICsgEJAQADsgMAAbICcAMA
A3ABAANwAwABcAH0DXoBWQHDAgAC8gEABu8BAALyAgACsgIABLIBAAOyAd0CAAGyAnAEAAVwBAABcAH0
DXoBWQHDAgAC8gEABu8BAALyAgACsgIAArIBtAGyARkBsgEAArICAAGyAnAFAANwBQABcAH0DXoBWQHD
AgAC8gIAAfABAAHyAu8BAALyAgACsgIAAbIBGQEAA7IBAAKyAgABsgJwBQADcAUAAXAB9A16AVkBwwIA
AvICAAHvAQAB8gLvAQAC8gIAArIBAAKyAgADsgIAAbIB8wEAAbICcAQABXAEAAFwAfQNWQE4AfQCAALy
AgAB7wEAAfIC7wEAAvICAAKyAQACsgIAAQkBsgMAArIBAAGyAnADAANwAQADcAMAAXABww44AfYCAALy
AQAD7QHyAu8BAALyAgACsg0AAbICcAMAAnADAAJwAwABcAHDBjgBWQb0AfYDAALyCAAB8QHzAgACsg0A
AbICcA0AAXAB9AY4Ab0KAALyBwAB9AHvAf8CAAKyDQABsgJwDQABcAH/AcMEmgG9Af8KAAHyAQcG8gHx
Ae8B/wMAELIQcBIAAf8H8gHzAf8EABCyEHABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEB
FgAD/wMAAcABAQYAAd8B+QQAAT8B/gHfAYEEAAEnAf4B3wH5BAABIwHyAdABAQQAATkB6gHfAfkEAAE8
AQIB0AEBBAABPgG+Ad8B+QQAAT4BfgHQAQEEAAE/AX4B3wH5BAABPgF+AdABAQQAAT4BfgHfAcEEAAE+
AX4B0AEDBAABPwF+Ad8BxwYAAd8BzwYAAcABHwQAAv8BwAEDBgABwAEDBgABzwHzAT8B/gE/Af4CAAHP
AfMBPwH+AT8B/gIAAcgBEwE5AY4BMQHOAgAByAETATABjgE4AY4CAAHIARMBMAGGATwBHgIAAcgBEwEw
ASYCPgIAAc0BEwEyASYCPgIAAc0BEwEmATIBPAEeAgABzQETASYBcgE4AY4CAAHIARMBPwH+ATkBzgEA
AQEBzwHzAT8B/gE/Af4BAAH/Ac8B4wE/Af4BPwH+AQAB/wHAAQcEAAL/AcABDwQACw==
</value>
</data>
<metadata name="contextMenuStripFavoriten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

11
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -23,6 +23,7 @@ using DOCGEN;
using System.Globalization;
using System.Threading;
using Syncfusion.Windows.Forms;
using Syncfusion.Grouping;
namespace OnDoc.DocMgmt
{
@@ -142,7 +143,7 @@ namespace OnDoc.DocMgmt
}
public void Dokument_Erstellen(string dokumentid, bool editdoc)
{
{
this.filename = "";
if (ucAllgemeineDokumentParam1.check_fields()==false) {
MessageBox.Show(ucAllgemeineDokumentParam1.check_error,"Feldwerte",MessageBoxButtons.OK,MessageBoxIcon.Error);
@@ -216,17 +217,21 @@ namespace OnDoc.DocMgmt
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
Logging.Logging.Debug("Dokumentbearbtung Saved", "OnDocClient", "");
Logging.Logging.Debug("Dokumentbearbeitung Saved", "OnDocClient", "");
System.IO.File.Delete(filename);
Logging.Logging.Debug("Dokumentbearbtung Deleted", "OnDocClient", "");
Logging.Logging.Debug("Dokumentbearbeitung Deleted", "OnDocClient", "");
filename = AppParams.tempdir + dokumentid +"." + dok.extension;
this.filename = filename;
DocFunction = 6;
this.Close();
return;
}
//Bearbeiten
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
Logging.Logging.Debug("Dokumentbearbeitung Erstellungsart.DokumentBearbeiten", "OnDocClient", "");

13
Client/Klassen/EDKFile.cs
View File

@@ -13,6 +13,7 @@ using System.Windows.Forms;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Serialization;
using Database;
namespace OnDoc.Klassen
@@ -59,6 +60,7 @@ namespace OnDoc.Klassen
public static class EDK_Data
{
public static EDK_ActionType action { get; set; }
public static string sourceApplication { get; set; }
public static string creatortg { get; set; }
public static string source { get; set; }
public static bool executed { get; set; }
@@ -95,8 +97,19 @@ namespace OnDoc.Klassen
return;
}
// read header elements
action = (EDK_ActionType)Enum.Parse(typeof(EDK_ActionType), doc.SelectSingleNode("action/actionId").InnerText, true);
sourceApplication = doc.SelectSingleNode("action/sourceApplication").InnerText;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from Avaloq_SourceApplication where AvaloqSourceApplication='" + sourceApplication + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) == 0)
{
Logging.Logging.Debug("EDK-Datei für fehlerhafte Instanz:" + source, "EDK-Verarbeitung", filename);
System.IO.File.Delete(filename);
MessageBox.Show("Der EDK-Aufruf ist ungültig, da dieser nciht für die richtige DB-Instanz ist: " + sourceApplication, "EDK-Aufruf", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
switch (action)
{
case EDK_ActionType.AnzeigePartnerdossier:

115
Client/Klassen/clsProcessWatch.cs
View File

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
using System.Timers;
using Database;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Input.Enums;
namespace OnDoc.Klassen
{
@@ -54,54 +55,61 @@ namespace OnDoc.Klassen
bool excel = false;
bool pdf = false;
bool found = false;
watchtimer.Enabled = false;
found= false;
foreach (FileToCheck fc in FilestoCheck)
{
Logging.Logging.Debug("FileChek "+fc.filename+" / " + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (fc.application == "Word") { word = true; }
if (fc.application == "Excel") { excel = true; }
if (fc.application == "PDF") { pdf = true; }
if (fc.filedatetime < DateTime.Now.AddSeconds(-5))
{
found = false;
Logging.Logging.Debug(fc.application + " / FileChek " + fc.filename + " / " + fc.filedatetime.ToString("yyyy-MM-dd hh:mm:ss") + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (fc.application == "Word") { word = true; }
if (fc.application == "Excel") { excel = true; }
if (fc.application == "PDF") { pdf = true; }
if (word)
{
Process[] localByName = Process.GetProcessesByName("WINWORD");
foreach (Process p in localByName)
if (word)
{
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1) { found = true; }
Process[] localByName = Process.GetProcessesByName("WINWORD");
foreach (Process p in localByName)
{
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1) { found = true; }
save_to_db(fc);
}
}
}
if (excel)
{
Process[] localByName = Process.GetProcessesByName("EXCEL");
foreach (Process p in localByName)
if (excel)
{
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > 0) { found = true; }
Process[] localByName = Process.GetProcessesByName("EXCEL");
foreach (Process p in localByName)
{
if (p.MainWindowTitle.IndexOf(fc.dokumentid) > 0) { found = true; }
save_to_db(fc);
}
}
}
if (!found)
{
Logging.Logging.Debug("Not Found "+fc.filename+" / "+ DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (Check_Modified(fc) == true)
if (!found)
{
Save_File(fc.dokumentid, fc.filename);
Logging.DocLog.Info("Dokument gespeichert und geschlossen", "Processwatch", fc.dokumentid, "", fc.filename);
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
Remove_Dokumentbearbeitung_Zwingend(fc.dokumentid);
Remove_Approvals(fc.dokumentid);
return;
Logging.Logging.Debug("Not Found " + fc.filename + " / " + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
if (Check_Modified(fc) == true)
{
Save_File(fc.dokumentid, fc.filename);
Logging.DocLog.Info("Dokument gespeichert und geschlossen", "Processwatch", fc.dokumentid, "", fc.filename);
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
Remove_Dokumentbearbeitung_Zwingend(fc.dokumentid);
Remove_Approvals(fc.dokumentid);
return;
}
else
{
Logging.DocLog.Info("Dokument ohne speichern geschlossen", "Processwatch", fc.dokumentid, "", fc.filename);
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
return;
};
}
else
{
Logging.DocLog.Info("Dokument ohne speichern geschlossen", "Processwatch", fc.dokumentid, "", fc.filename);
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
return;
};
}
}
watchtimer.Enabled = true;
}
private static void Remove_Dok_in_Bearbeitung(string dokumentid)
@@ -124,6 +132,28 @@ namespace OnDoc.Klassen
db = null;
}
private static void save_to_db(FileToCheck fc)
{
if (Check_Modified(fc))
{
try
{
System.IO.File.Copy(fc.filename, fc.filename + ".tmp");
Save_File(fc.dokumentid, fc.filename + ".tmp");
fc.filedatetime = DateTime.Now;
System.IO.File.Delete(fc.filename + ".tmp");
Logging.Logging.Debug(fc.application + " / save_to_db " + fc.filename + " / " + fc.filedatetime.ToString("yyyy-MM-dd hh:mm:ss") + "/"+DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
}
catch
{
Logging.Logging.Debug(fc.application + " / save_to_db faild " + fc.filename + " / " + fc.filedatetime.ToString("yyyy-MM-dd hh:mm:ss") +"/"+ DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), "OnDoc.Processwatch", fc.dokumentid);
}
}
}
private static void Save_File(string dokumentid, string filename)
{
DB db = new DB(AppParams.connectionstring);
@@ -139,8 +169,11 @@ 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)
int secdiff = (int)((lwt - fc.filedatetime).TotalSeconds);
Logging.Logging.Debug("Prozesswatch - Check Modified: " + lwt.ToString() + "," + fc.filedatetime.ToString(), "OnDoc", fc.dokumentid);
//Logging.DocLog.Debug("Prozesswatch - Check Modified: " + lwt.ToString() + "," + fc.filedatetime.ToString(), "Processwatch", fc.dokumentid, "", fc.filename);
//if ((lwt- fc.filedatetime).Seconds > 2)
if (secdiff > 2)
{
return true;
}
@@ -150,6 +183,11 @@ namespace OnDoc.Klassen
}
}
public static int check_open_files()
{
return FilestoCheck.Count;
}
}
public class FileToCheck
{
@@ -165,7 +203,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");
//Logging.DocLog.Debug("Add Processwatch: " + DateTime.Now.ToString(), "New FileToCheck", dokumentid, "", "Add Processwatch");
Logging.Logging.Debug("Add Processwatch: " + DateTime.Now.ToString(),"OnDoc",this.dokumentid);
}
}

1
Client/Klassen/clsWordEdit.cs
View File

@@ -32,6 +32,7 @@ namespace OnDoc.Klassen
{
try
{
//word = Interaction.CreateObject("Word.Application")
word = new Microsoft.Office.Interop.Word.Application();
return true;
}

1
Client/Start.Designer.cs generated
View File

@@ -218,6 +218,7 @@ namespace OnDoc
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "OnDoc";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Start_FormClosing);
this.Load += new System.EventHandler(this.Start_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();

18
Client/Start.cs
View File

@@ -59,11 +59,11 @@ namespace OnDoc
Logging.Logging.Debug("Start", "start.cs", mitarbeiter);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select mitarbeiternr, tgnummer from mitarbeiter where tgnummer='" + mitarbeiter + "'", false, true); if (db.dsdaten.Tables[0].Rows.Count == 0)
db.Get_Tabledata("Select mitarbeiternr, tgnummer from mitarbeiter where aktiv = 1 and tgnummer='" + mitarbeiter + "'", false, true); if (db.dsdaten.Tables[0].Rows.Count == 0)
{
mitarbeiter = mitarbeiter.Replace("i", "");
mitarbeiter = mitarbeiter.Replace("I", "");
db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + mitarbeiter + "'", false, true);
db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where aktiv=1 and tgnummer='" + mitarbeiter + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0)
{
MessageBox.Show("Berechtigung zur Verwendung von OnDoc fehlen", "Anmeldung OnDoc", MessageBoxButtons.OK);
@@ -402,5 +402,19 @@ namespace OnDoc
dokList1.set_functions();
}
}
private void Start_FormClosing(object sender, FormClosingEventArgs e)
{
if (clsProcessWatch.check_open_files() > 0)
{
if (MessageBox.Show("Es sind noch Dokumente in Bearbeitung." + Environment.NewLine + "Trotzem schliessen? - Allfällige Änderungen werden nicht gespeichert.", "OnDoc schliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
}
else
{
e.Cancel = true;
}
}
}
}
}

44
Client/Start.resx
View File

@@ -120,52 +120,52 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="rbbtnneuesdokument.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbJJREFUWEft
10soBVEAxvGRRykkxcaGkrKShQ1lIUVKiaQsPEKxY69sLJRSlpKSjYWbQpSSRyLKykKRUhIlr1AsvP7f
3LkluePOudfdmK9+dWYxzTdnztx7xvqWHLzgDa8e6ZxjFCEBRsnDAwbR4FErdrEOlTCKClyj0j7ynmzs
4AhGMxFtAaUYKmE0E7EooBjPRKwKKEYzYVKgCocYQBZ016eOK3xgDxHFpIDO6UEZUp1x3xdzUJmIEstH
EIpK+AX8An4Bv4Bf4P8VSIL+GdMQ1wLaeLRgGqtYxjbiUqAQi7jEAoYxjgM8ohEpcE00BWahi1cjHfXI
h3ZDE9AsVMA1pgVqoPPq7KNg7tAeHFqJ2MSafeQS0wKj0N5Pm9EMZOIevc44GV14ghZm2JgU0N0FMINy
6CLyDn1laazHo73jLXSNsDEpoJU/iSXkotahC2tmNC6Bvp6eodczbFRArVcw5cE+LqAFGIruti04tH8X
5qFtumu0evUq6Xl6dY4taB0oQyiFnn8nbtCBP4umeQNnGEETuqFyeqz9+PV3IJpoLRRgDCfQ57rWgWa0
GT9c3LI+AcR5pxP2d1iJAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAb1JREFUWEft
10+EVmEUx/HPqBliSqI2bRoSrdKiTdEiUWJISbToj4pmV/to0yKGoWUSaTOLGUOliPRHStGqRZSIpEhT
qahFf8bhDO9c3Xrf533NpvvjcNzr3PN9znPuvedhrlbgO37iR4cWMc+xFn2V57atVfiMU9jVoe3HQ9xO
iCIFwHtsqd5oU8vxAM9KK9EtQGhdQhRVohcAoeJK9AogVFSJEoCteIqTWJarfpn2Dr/xqBpUpxKAiDmG
jViU/vEWm0qYtlQC8C8FRAPQADQADUAD8P8BLMw/4+B8A8TgsQ+XcBPXcX++ANbgKt7iCs7gHJ7gC3Zj
oBpUVTcAE5l8GxZjJ4ZyGjqfVdhcDaqqFGB7xg23XPuIg+kvwF3carn/R5UCjOXsF8PoEizFJ4yk348j
+JqNWasSgFjdJMaxKZOE/cpTVvixPTE7fsgctSoBiM6/gGtYiR1pkTgqE/76PD19y9ezVgEQ1DdwsQN7
jDfZgLOK1R5IP74Ll3NM/6uie+NViv3s1F7jXvZB6DQ25P4fxjQOVfL1VFHmO3iFUezB0YSLbT3Rzneg
G0UvrMZZvMjjevRBVHRvXfIZxHmnEz0PryIAAAAASUVORK5CYII=
</value>
</data>
<data name="rbbtnneuesdokument.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbJJREFUWEft
10soBVEAxvGRRykkxcaGkrKShQ1lIUVKiaQsPEKxY69sLJRSlpKSjYWbQpSSRyLKykKRUhIlr1AsvP7f
3LkluePOudfdmK9+dWYxzTdnztx7xvqWHLzgDa8e6ZxjFCEBRsnDAwbR4FErdrEOlTCKClyj0j7ynmzs
4AhGMxFtAaUYKmE0E7EooBjPRKwKKEYzYVKgCocYQBZ016eOK3xgDxHFpIDO6UEZUp1x3xdzUJmIEstH
EIpK+AX8An4Bv4Bf4P8VSIL+GdMQ1wLaeLRgGqtYxjbiUqAQi7jEAoYxjgM8ohEpcE00BWahi1cjHfXI
h3ZDE9AsVMA1pgVqoPPq7KNg7tAeHFqJ2MSafeQS0wKj0N5Pm9EMZOIevc44GV14ghZm2JgU0N0FMINy
6CLyDn1laazHo73jLXSNsDEpoJU/iSXkotahC2tmNC6Bvp6eodczbFRArVcw5cE+LqAFGIruti04tH8X
5qFtumu0evUq6Xl6dY4taB0oQyiFnn8nbtCBP4umeQNnGEETuqFyeqz9+PV3IJpoLRRgDCfQ57rWgWa0
GT9c3LI+AcR5pxP2d1iJAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAb1JREFUWEft
10+EVmEUx/HPqBliSqI2bRoSrdKiTdEiUWJISbToj4pmV/to0yKGoWUSaTOLGUOliPRHStGqRZSIpEhT
qahFf8bhDO9c3Xrf533NpvvjcNzr3PN9znPuvedhrlbgO37iR4cWMc+xFn2V57atVfiMU9jVoe3HQ9xO
iCIFwHtsqd5oU8vxAM9KK9EtQGhdQhRVohcAoeJK9AogVFSJEoCteIqTWJarfpn2Dr/xqBpUpxKAiDmG
jViU/vEWm0qYtlQC8C8FRAPQADQADUAD8P8BLMw/4+B8A8TgsQ+XcBPXcX++ANbgKt7iCs7gHJ7gC3Zj
oBpUVTcAE5l8GxZjJ4ZyGjqfVdhcDaqqFGB7xg23XPuIg+kvwF3carn/R5UCjOXsF8PoEizFJ4yk348j
+JqNWasSgFjdJMaxKZOE/cpTVvixPTE7fsgctSoBiM6/gGtYiR1pkTgqE/76PD19y9ezVgEQ1DdwsQN7
jDfZgLOK1R5IP74Ll3NM/6uie+NViv3s1F7jXvZB6DQ25P4fxjQOVfL1VFHmO3iFUezB0YSLbT3Rzneg
G0UvrMZZvMjjevRBVHRvXfIZxHmnEz0PryIAAAAASUVORK5CYII=
</value>
</data>
<data name="rbbtnneuesdokument.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

@@ -41,6 +41,8 @@ namespace OnDoc.UICintrols
this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -51,7 +53,6 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -63,6 +64,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -166,9 +168,7 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -207,7 +207,7 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
@@ -272,6 +272,19 @@ namespace OnDoc.UICintrols
this.druckenToolStripMenuItem.Visible = false;
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
@@ -346,14 +359,6 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
@@ -486,6 +491,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -1387,16 +1402,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1405,11 +1410,6 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

25
Client/UIControls/DokList.cs
View File

@@ -646,11 +646,28 @@ namespace OnDoc.UICintrols
private void OpenDoc(clsdok dok, bool editdoc, bool interop = false, bool runmacros = false)
{
//DB db = new DB(AppParams.connectionstring);
//string docfilename = "";
//try
//{
// db.Get_Tabledata("Select dokumentname from dokument where dokumentid='" + selected_dokumentid + "'", false, true);
// docfilename = db.dsdaten.Tables[0].Rows[0][0].ToString();
//}
//catch
//{
// docfilename = selected_dokumentid;
//}
//finally {
// db = null;
//}
switch (dok.extension.ToUpper().Substring(0, 1))
{
case "D":
clsFileHelper fh = new clsFileHelper();
string tempfilename = "";
tempfilename = fh.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
//System.Diagnostics.Process.Start(tempfilename);
if (interop == true)
@@ -661,7 +678,7 @@ namespace OnDoc.UICintrols
}
else
{
System.Diagnostics.Process.Start("winword.exe", "/w " + tempfilename);
System.Diagnostics.Process.Start("winword.exe", "/n " + tempfilename);
}
if (editdoc == true)
@@ -692,7 +709,7 @@ namespace OnDoc.UICintrols
break;
case "P":
clsFileHelper fh3 = new clsFileHelper();
tempfilename = fh3.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
tempfilename = fh3.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension );
System.Diagnostics.Process.Start(tempfilename);
if (editdoc == true)
{
@@ -2167,6 +2184,7 @@ namespace OnDoc.UICintrols
if (get_selected_records() == 0)
{
RibbonButtonEditEditDoc.Enabled = false;
ribbibButtonShowDoc.Enabled = false;
RibbonButtonEditDelete.Enabled = false;
RibbonButtonZuweisen.Enabled = false;
ribbonButtonToApproval.Enabled = false;
@@ -2186,6 +2204,7 @@ namespace OnDoc.UICintrols
else
{
RibbonButtonEditEditDoc.Enabled = true;
ribbibButtonShowDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
RibbonButtonZuweisen.Enabled = true;
ribbonButtonToApproval.Enabled = true;
@@ -2230,6 +2249,7 @@ namespace OnDoc.UICintrols
if (get_selected_records() == 0)
{
RibbonButtonEditEditDoc.Enabled = false;
ribbibButtonShowDoc.Enabled = false;
RibbonButtonEditDelete.Enabled = false;
RibbonButtonZuweisen.Enabled = false;
ribbonButtonToApproval.Enabled = false;
@@ -2245,6 +2265,7 @@ namespace OnDoc.UICintrols
else
{
RibbonButtonEditEditDoc.Enabled = true;
ribbibButtonShowDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
RibbonButtonZuweisen.Enabled = true;
ribbonButtonToApproval.Enabled = true;

2
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -942,7 +942,7 @@ namespace OnDoc.UIControls
{
Partnersuche p = new Partnersuche();
p.ShowDialog();
if (p.partnernr != 0) { return p.partnernr.ToString() + " - " + p.partnerkurzname; } else { return ""; }
if (p.partnernr != 0) { return p.partnernr.ToString() + "-" + p.partnerkurzname; } else { return ""; }
}
valueselector vs = new valueselector();

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

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/Debug/OFFEDK0082025002489360.docx Normal file
View File

Binary file not shown.

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

Binary file not shown.

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/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.

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.DocMgmt.DokTypSelect.resources
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.