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

update 20250317

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-18 06:37:31 +01:00
parent 238e592ec8
commit 7e3381c926
280 changed files with 2730906 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -67,13 +67,18 @@ namespace OnDoc.DocMgmt
this.ordnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.detailsAnzeigenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.grpFavoriten = new System.Windows.Forms.GroupBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnNewRoot = new System.Windows.Forms.ToolStripButton();
this.tsbtnNewFolder = new System.Windows.Forms.ToolStripButton();
this.tsbtnRename = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtndelete = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.grpVorlagen = new System.Windows.Forms.GroupBox();
this.toolStrip2 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
@@ -84,11 +89,6 @@ namespace OnDoc.DocMgmt
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.toolstripCombobox_Fachverantwortung = new System.Windows.Forms.ToolStripComboBox();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.contextMenuStripVorlagen.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv2)).BeginInit();
@@ -364,6 +364,7 @@ namespace OnDoc.DocMgmt
this.imageList1.Images.SetKeyName(3, "272703_excel_icon.png");
this.imageList1.Images.SetKeyName(4, "272705_pdf_icon.png");
this.imageList1.Images.SetKeyName(5, "DocTypeUnKnown.ico");
this.imageList1.Images.SetKeyName(6, "QDF_16x16-32.png");
//
// treeViewAdv2
//
@@ -480,6 +481,34 @@ namespace OnDoc.DocMgmt
this.grpFavoriten.TabIndex = 4;
this.grpFavoriten.TabStop = false;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(266, 40);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(153, 13);
this.label3.TabIndex = 7;
this.label3.Text = "- Mit Speichersymbol speichern";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(266, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(225, 13);
this.label2.TabIndex = 6;
this.label2.Text = "- Element anwählen und Tasten Ctrl Up/Down";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(266, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(69, 13);
this.label1.TabIndex = 5;
this.label1.Text = "Sortierung:";
//
// toolStrip1
//
this.toolStrip1.AutoSize = false;
@@ -551,6 +580,11 @@ namespace OnDoc.DocMgmt
this.tsbtndelete.Text = "Vorlage / Ordner mit Unterelementen löschen";
this.tsbtndelete.Click += new System.EventHandler(this.tsbtndelete_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 48);
//
// toolStripButton3
//
this.toolStripButton3.AutoSize = false;
@@ -564,6 +598,11 @@ namespace OnDoc.DocMgmt
this.toolStripButton3.ToolTipText = "Sortierung speichern";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(0, 45);
//
// grpVorlagen
//
this.grpVorlagen.Controls.Add(this.treeViewAdv1);
@@ -656,44 +695,6 @@ namespace OnDoc.DocMgmt
this.toolStripButton4.Text = "Fachverantwortung initialisieren";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 48);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(0, 45);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(266, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(69, 13);
this.label1.TabIndex = 5;
this.label1.Text = "Sortierung:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(266, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(225, 13);
this.label2.TabIndex = 6;
this.label2.Text = "- Element anwählen und Tasten Ctrl Up/Down";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(266, 40);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(153, 13);
this.label3.TabIndex = 7;
this.label3.Text = "- Mit Speichersymbol speichern";
//
// DokTypSelect
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

15
Client/DocMgmt/DokTypSelect.cs
View File

@@ -129,7 +129,16 @@ namespace OnDoc.DocMgmt
tnnativ2.Tag = dr[0].ToString();
tnnativ2.Text = dr[1].ToString()+" [Ohne Archivierung]";
tnnativ2.TagObject = dr;
tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32(dr["apptype"]) };
if (dr[1].ToString().Contains("QDF"))
{
tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32("6") };
}
else
{
tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32(dr["apptype"]) };
}
tnnativ.Nodes.Add(tnnativ2);
}
@@ -436,6 +445,10 @@ namespace OnDoc.DocMgmt
{
cChild.LeftImageIndices = new int[] { Convert.ToInt32(row["apptype"]) };
}
if (row["bez"].ToString().Contains("QDF"))
{
cChild.LeftImageIndices = new int[] { 6 };
}
//Recursively build the tree
PopulateTree_Favoriten(row, cChild);

63
Client/DocMgmt/DokTypSelect.resx
View File

@@ -282,8 +282,8 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
DAAAAk1TRnQBSQFMAgEBBgEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
DQAAAk1TRnQBSQFMAgEBBwEAAVABAQFQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -312,29 +312,36 @@
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
AQAG/wH0A/MB9AX/EAAQFwIAAQkKAAH0AfMBAAT/AfQBGQEJAeEBuwEZAbsBvAH0A/8QAAIXDQABFwIA
AQkGAAHWAgkB8QH0AfMBAAP/AfMBmAS6AdwBuwGzAboB8wL/EAACFwEAAhcKAAEXAgABCQoAAfQB8wEA
Av8B8wGRAbMBugG5AdsBugHbAQAB2gGzAboB8wH/EAACFwEAAxcGAAIXAQABFwIAAQkBAAjWAfEB9AHz
AQAC/wG6AbMBugHaAQkBAAHhAboB/wHbArMBuwH0EAACFwMAAhcEAAEXAQABFgEAARcCAAEJCgAB9AHz
AQAB/wHyAbkBswO6ARkBugHhAf8BuQG6AbMBtAHzEAACFwQAARcBFgYXAQABFwIAAQkBAAgJAfIB9AHz
AQAB/wEZAbkBswG6AdoBuQEZAQAB/wHiAdsBGQG6AbMB8RAAAhcFAAEXAQABFwUAARcCAAEJCgAB9AHz
AQAB/wG7AdsC2gG6AdoBCQP/AQgBGQHVAbMB8BAAAhcFAAIXBgABFwIAAQkBAAgJAfMB9AHzAQAB/wEZ
AbsB2wG7AdsB6AP/AdsCugKzAfEQAAIXBgABFwYAARcCAAEJCgAB9AHzAQAB/wHyAboBCQEIARkB8wL/
AbsBugOzAbQB8xAAAhcFAAIXBgABFwIAAQkBAAgJAfMB9AHzAQAC/wEJARkB9AEZAv8B9AEJAdsBugKz
AbsB9BAAAhcFAAIXBgABFwIAAQkHAAG8AhkBCQHzAQAC/wHyAboBCQEIAf8CGQHiARkB2gGzAZEB9AH/
EAACFwUAAhcGAAEXAgABCQEABhkECQIAA/8BGQG6ARkB/wEAAQgBGQEJAbQBuwHzAv8QAAIXBgABFwYA
ARcCAAEJBwACCQHcAwAE/wH0AQgB9AEZAQgCCQEZAfQD/xAAEBcCAAEJBwABCQHcBAAH/wH0AfMB9Ab/
EAAQFwIAAfEICQUAEP8iAAH/CvIB/wIAELIQcAH/AcMMmgHDAf8CAAHyAQcI8gEHAfICABCyEHAB9A16
AVkB9AIAAvIIAALyAgACsg0AAbICcA0AAXAB9A16AVkBwwIAAvIIAALyAgACsg0AAbICcA0AAXAB9A16
AVkBwwIAAvIBAAbvAQAC8gIAArIDAAKyAgABtAKyAwABsgJwAgADcAMAAnADAAFwAfQNegFZAcMCAALy
AQAG7wEAAvICAAKyAgAB8gKyAQkBAAOyAwABsgJwAwADcAEAA3ADAAFwAfQNegFZAcMCAALyAQAG7wEA
AvICAAKyAgAEsgEAA7IB3QIAAbICcAQABXAEAAFwAfQNegFZAcMCAALyAQAG7wEAAvICAAKyAgACsgG0
AbIBGQGyAQACsgIAAbICcAUAA3AFAAFwAfQNegFZAcMCAALyAgAB8AEAAfIC7wEAAvICAAKyAgABsgEZ
AQADsgEAArICAAGyAnAFAANwBQABcAH0DXoBWQHDAgAC8gIAAe8BAAHyAu8BAALyAgACsgEAArICAAOy
AgABsgHzAQABsgJwBAAFcAQAAXAB9A1ZATgB9AIAAvICAAHvAQAB8gLvAQAC8gIAArIBAAKyAgABCQGy
AwACsgEAAbICcAMAA3ABAANwAwABcAHDDjgB9gIAAvIBAAPtAfIC7wEAAvICAAKyDQABsgJwAwACcAMA
AnADAAFwAcMGOAFZBvQB9gMAAvIIAAHxAfMCAAKyDQABsgJwDQABcAH0BjgBvQoAAvIHAAH0Ae8B/wIA
ArINAAGyAnANAAFwAf8BwwSaAb0B/woAAfIBBwbyAfEB7wH/AwAQshBwEgAB/wfyAfMB/wQAELIQcAFC
AU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/AwABwAEBBgAB3wH5BAABPwH+Ad8BgQQA
AScB/gHfAfkEAAEjAfIB0AEBBAABOQHqAd8B+QQAATwBAgHQAQEEAAE+Ab4B3wH5BAABPgF+AdABAQQA
AT8BfgHfAfkEAAE+AX4B0AEBBAABPgF+Ad8BwQQAAT4BfgHQAQMEAAE/AX4B3wHHBgAB3wHPBgABwAEf
BAAC/wHAAQMGAAHAAQMGAAHPAfMBPwH+AT8B/gIAAc8B8wE/Af4BPwH+AgAByAETATkBjgExAc4CAAHI
ARMBMAGOATgBjgIAAcgBEwEwAYYBPAEeAgAByAETATABJgI+AgABzQETATIBJgI+AgABzQETASYBMgE8
AR4CAAHNARMBJgFyATgBjgIAAcgBEwE/Af4BOQHOAQABAQHPAfMBPwH+AT8B/gEAAf8BzwHjAT8B/gE/
Af4BAAH/AcABBwQAAv8BwAEPBAAL
</value>
</data>
<metadata name="contextMenuStripFavoriten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -343,12 +350,6 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>723, 16</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>723, 16</value>
</metadata>

8
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -129,7 +129,7 @@ namespace OnDoc.DocMgmt
// btnDokumenterstellen.Enabled = false;
//}
Security security = new Security();
security.set_security(this);
security.set_security_general(this);
security = null;
}
@@ -195,6 +195,7 @@ namespace OnDoc.DocMgmt
dB = null;
}
Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung");
if (dokumentid != "")
{
@@ -203,7 +204,10 @@ namespace OnDoc.DocMgmt
Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes",this.editdoc);
Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
if (dok.extension == "QDF") {
this.Close();
DocFunction = 99;
return; }
interop = ucAllgemeineDokumentParam1.interop;

5
Client/DocMgmt/frmSerienbrief.cs
View File

@@ -45,6 +45,11 @@ namespace OnDoc.DocMgmt
////Closing += Form_Closing;
}
public void create_new_sb(int dokumenttypnr)
{
serienbrief1.create_new_sb(dokumenttypnr);
}
private void Form_Closing(object sender, CancelEventArgs e)
{
serienbrief1.dispose();