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

update 20241125

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-24 19:38:37 +01:00
parent 6bdbc4173e
commit 341ea50f06
281 changed files with 14362 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Client/Diverses/NativVorlagen.cs
View File

@@ -263,6 +263,7 @@ namespace OnDoc.Diverses
//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();

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

@@ -49,6 +49,8 @@ namespace OnDoc.DocMgmt
this.RibbonButtonVorlagen = new System.Windows.Forms.RibbonButton();
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton();
this.ribbonButtonFilter = new System.Windows.Forms.RibbonPanel();
this.ribboncomboboxfachverantwortung = new System.Windows.Forms.RibbonComboBox();
this.imageListAdv1 = new Syncfusion.Windows.Forms.Tools.ImageListAdv(this.components);
this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
@@ -69,14 +71,24 @@ namespace OnDoc.DocMgmt
this.tsbtnRename = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtndelete = new System.Windows.Forms.ToolStripButton();
this.ribbonButtonFilter = new System.Windows.Forms.RibbonPanel();
this.ribboncomboboxfachverantwortung = new System.Windows.Forms.RibbonComboBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.toolStrip2 = new System.Windows.Forms.ToolStrip();
this.toolstriptextboxsearch = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.toolstripCombobox_Fachverantwortung = new System.Windows.Forms.ToolStripComboBox();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.contextMenuStripVorlagen.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv2)).BeginInit();
this.contextMenuStripFavoriten.SuspendLayout();
this.groupBox1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.toolStrip2.SuspendLayout();
this.SuspendLayout();
//
// ribbon1
@@ -137,6 +149,7 @@ namespace OnDoc.DocMgmt
this.ribbonPanel2.Items.Add(this.ribbonItemGroup1);
this.ribbonPanel2.Name = "ribbonPanel2";
this.ribbonPanel2.Text = "Suche";
this.ribbonPanel2.Visible = false;
//
// ribbonItemGroup1
//
@@ -218,6 +231,19 @@ namespace OnDoc.DocMgmt
this.RibbonButtonFavoriten.Text = "";
this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click);
//
// ribbonButtonFilter
//
this.ribbonButtonFilter.Items.Add(this.ribboncomboboxfachverantwortung);
this.ribbonButtonFilter.Name = "ribbonButtonFilter";
this.ribbonButtonFilter.Text = "Filter Fachverantwortung";
this.ribbonButtonFilter.Visible = false;
//
// ribboncomboboxfachverantwortung
//
this.ribboncomboboxfachverantwortung.Name = "ribboncomboboxfachverantwortung";
this.ribboncomboboxfachverantwortung.SelectedIndex = -1;
this.ribboncomboboxfachverantwortung.TextBoxText = "";
//
// imageListAdv1
//
this.imageListAdv1.Images.AddRange(new System.Drawing.Image[] {
@@ -248,9 +274,9 @@ namespace OnDoc.DocMgmt
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(498, 584);
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(494, 517);
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStripVorlagen;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
//
//
//
@@ -261,11 +287,11 @@ namespace OnDoc.DocMgmt
this.treeViewAdv1.HelpTextControl.TabIndex = 0;
this.treeViewAdv1.HelpTextControl.Visible = true;
this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.treeViewAdv1.Location = new System.Drawing.Point(2, 76);
this.treeViewAdv1.Location = new System.Drawing.Point(3, 64);
this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv1.Name = "treeViewAdv1";
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(498, 584);
this.treeViewAdv1.Size = new System.Drawing.Size(494, 517);
this.treeViewAdv1.TabIndex = 2;
this.treeViewAdv1.Text = "treeViewAdv1";
this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
@@ -314,6 +340,10 @@ namespace OnDoc.DocMgmt
this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "Folder.png");
this.imageList1.Images.SetKeyName(1, "Dokumenttype.png");
this.imageList1.Images.SetKeyName(2, "272708_word_icon.png");
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");
//
// treeViewAdv2
//
@@ -344,6 +374,7 @@ namespace OnDoc.DocMgmt
this.treeViewAdv2.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv2.Name = "treeViewAdv2";
this.treeViewAdv2.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv2.ShouldSelectNodeOnEnter = false;
this.treeViewAdv2.Size = new System.Drawing.Size(498, 523);
this.treeViewAdv2.TabIndex = 3;
this.treeViewAdv2.Text = "treeViewAdv2";
@@ -408,7 +439,7 @@ namespace OnDoc.DocMgmt
this.groupBox1.Controls.Add(this.treeViewAdv2);
this.groupBox1.Controls.Add(this.toolStrip1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox1.Location = new System.Drawing.Point(500, 76);
this.groupBox1.Location = new System.Drawing.Point(502, 76);
this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(0);
@@ -484,17 +515,94 @@ namespace OnDoc.DocMgmt
this.tsbtndelete.Text = "Vorlage / Ordner mit Unterlementen löschen";
this.tsbtndelete.Click += new System.EventHandler(this.tsbtndelete_Click);
//
// ribbonButtonFilter
// groupBox2
//
this.ribbonButtonFilter.Items.Add(this.ribboncomboboxfachverantwortung);
this.ribbonButtonFilter.Name = "ribbonButtonFilter";
this.ribbonButtonFilter.Text = "Filter Fachverantwortung";
this.groupBox2.Controls.Add(this.treeViewAdv1);
this.groupBox2.Controls.Add(this.toolStrip2);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox2.Location = new System.Drawing.Point(2, 76);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(500, 584);
this.groupBox2.TabIndex = 5;
this.groupBox2.TabStop = false;
//
// ribboncomboboxfachverantwortung
// toolStrip2
//
this.ribboncomboboxfachverantwortung.Name = "ribboncomboboxfachverantwortung";
this.ribboncomboboxfachverantwortung.SelectedIndex = -1;
this.ribboncomboboxfachverantwortung.TextBoxText = "";
this.toolStrip2.AutoSize = false;
this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.toolstriptextboxsearch,
this.toolStripButton1,
this.toolStripButton2,
this.toolStripSeparator2,
this.toolStripLabel2,
this.toolstripCombobox_Fachverantwortung,
this.toolStripButton4});
this.toolStrip2.Location = new System.Drawing.Point(3, 16);
this.toolStrip2.Name = "toolStrip2";
this.toolStrip2.Size = new System.Drawing.Size(494, 48);
this.toolStrip2.TabIndex = 5;
this.toolStrip2.Text = "toolStrip2";
//
// toolstriptextboxsearch
//
this.toolstriptextboxsearch.Font = new System.Drawing.Font("Segoe UI", 9F);
this.toolstriptextboxsearch.Name = "toolstriptextboxsearch";
this.toolstriptextboxsearch.Size = new System.Drawing.Size(100, 48);
this.toolstriptextboxsearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolstriptextboxsearch_KeyDown);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(49, 45);
this.toolStripLabel1.Text = "Suchen:";
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = global::OnDoc.Properties.Resources.Search_24x24_32;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 45);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(23, 45);
this.toolStripButton2.Text = "toolStripButton2";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 48);
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(110, 45);
this.toolStripLabel2.Text = "Fachverantwortung";
//
// toolstripCombobox_Fachverantwortung
//
this.toolstripCombobox_Fachverantwortung.Name = "toolstripCombobox_Fachverantwortung";
this.toolstripCombobox_Fachverantwortung.Size = new System.Drawing.Size(121, 48);
this.toolstripCombobox_Fachverantwortung.SelectedIndexChanged += new System.EventHandler(this.toolstripCombobox_Fachverantwortung_SelectedIndexChanged);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 45);
this.toolStripButton4.Text = "toolStripButton2";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// DokTypSelect
//
@@ -502,7 +610,7 @@ namespace OnDoc.DocMgmt
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1000, 662);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.treeViewAdv1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.sfListView1);
this.Controls.Add(this.ribbon1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -520,6 +628,9 @@ namespace OnDoc.DocMgmt
this.groupBox1.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.toolStrip2.ResumeLayout(false);
this.toolStrip2.PerformLayout();
this.ResumeLayout(false);
}
@@ -562,5 +673,15 @@ namespace OnDoc.DocMgmt
private System.Windows.Forms.RibbonButton ribbonButtonClear;
private System.Windows.Forms.RibbonPanel ribbonButtonFilter;
private System.Windows.Forms.RibbonComboBox ribboncomboboxfachverantwortung;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.ToolStrip toolStrip2;
private System.Windows.Forms.ToolStripTextBox toolstriptextboxsearch;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripComboBox toolstripCombobox_Fachverantwortung;
private System.Windows.Forms.ToolStripButton toolStripButton4;
}
}

74
Client/DocMgmt/DokTypSelect.cs
View File

@@ -20,6 +20,7 @@ using System.Xml.Linq;
using System.Web.UI.WebControls;
using Microsoft.SqlServer.Server;
using System.Collections;
using OnDoc.UICintrols;
namespace OnDoc.DocMgmt
{
@@ -58,6 +59,7 @@ namespace OnDoc.DocMgmt
}
else
{
groupBox2.Visible = false;
treeViewAdv1.Visible = false;
}
@@ -74,17 +76,22 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("select distinct dbo.get_fachverantwortung(dbo.dokument.dokumenttypnr) from dbo.dokumenttyp", false, true);
//foreach (System.Data.DataRow in db.dsdaten.Tables)
db.Get_Tabledata("select distinct dbo.get_fachverantwortung(dbo.dokumenttyp.dokumenttypnr) as fv from dbo.dokumenttyp order by dbo.get_fachverantwortung(dbo.dokumenttyp.dokumenttypnr) asc", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
toolstripCombobox_Fachverantwortung.Items.Add(dr[0].ToString());
}
if (this.favoriten) { Load_Favoriten(""); }
else { load_standard(""); }
toolstriptextboxsearch.Focus();
}
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
int nodextoexpandindex = 1;
public void load_standard(string filter)
public void load_standard(string filter, string filter_fachverantwortung="")
{
Cursor = Cursors.WaitCursor;
@@ -94,15 +101,28 @@ namespace OnDoc.DocMgmt
}
treeViewAdv1.Enabled = false;
treeViewAdv1.Visible = false;
groupBox2.Visible = false;
treeViewAdv1.BeginUpdate();
treeViewAdv1.Nodes.Clear();
treeViewAdv1.LeftImageList = imageList1;
string where = "";
if (filter != "")
{
where = "and bezeichnung like '%" + filter.Replace(" ", "%") + "%'";
}
if (toolstripCombobox_Fachverantwortung.Text != "")
{
if (filter != "")
{
where = where + " and fachverantwortung='" + toolstripCombobox_Fachverantwortung.Text + "'";
}
else
{
where = " and fachverantwortung='" + toolstripCombobox_Fachverantwortung.Text + "'";
}
}
if (vorlagentype == 1)
{
@@ -112,7 +132,7 @@ namespace OnDoc.DocMgmt
DataTable vorlagen = new DataTable();
DataTable Struktur = new DataTable();
DataSet ds = new DataSet();
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp, apptype from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
vorlagen = db.dsdaten.Tables[0].Copy();
db.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
@@ -142,7 +162,7 @@ namespace OnDoc.DocMgmt
PopulateTree(dr, root);
}
}
if (filter == "")
if (where == "")
{
try
{
@@ -163,7 +183,7 @@ namespace OnDoc.DocMgmt
this.Text = "Dokumentpaket auswählen";
if (vorlagentype == 2) { RibbonButtonVorlagen.Checked = true; }
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dokumentpaketnr as id, bezeichnung, dokumentartnr as node from edex_dokumentpaket where aktiv=1 " + where + " order by bezeichnung", false, true);
db.Get_Tabledata("Select dokumentpaketnr as id, bezeichnung, dokumentartnr as node, 1 as apptype from edex_dokumentpaket where aktiv=1 " + where + " order by bezeichnung", false, true);
DataTable vorlagen = new DataTable();
DataTable Struktur = new DataTable();
@@ -208,6 +228,7 @@ namespace OnDoc.DocMgmt
treeViewAdv1.EndUpdate();
treeViewAdv1.Enabled = true;
treeViewAdv1.Visible = true;
groupBox2.Visible = true;
if (ExternalCall.struktur != "")
@@ -226,7 +247,8 @@ namespace OnDoc.DocMgmt
{
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString());
cChild.LeftImageIndices = new int[] { 1 };
//cChild.LeftImageIndices = new int[] { 1 };
cChild.LeftImageIndices = new int[] { Convert.ToInt32(row["apptype"]) };
cChild.Tag = Convert.ToInt32(row["id"]) * 1;
cChild.TagObject = row;
pNode.Nodes.Add(cChild);
@@ -335,7 +357,7 @@ namespace OnDoc.DocMgmt
}
else
{
cChild.LeftImageIndices = new int[] { 1 };
cChild.LeftImageIndices = new int[] { Convert.ToInt32(row["apptype"]) };
}
//Recursively build the tree
@@ -463,12 +485,14 @@ namespace OnDoc.DocMgmt
if (RibbonButtonVorlagen.Checked == true)
{
treeViewAdv1.Visible = true;
load_standard(RibbonTextSearch.TextBoxText);
groupBox2.Visible = true;
load_standard(toolstriptextboxsearch.Text);
treeViewAdv1_VisibleChanged(sender, e);
}
else
{
treeViewAdv1.Visible = false;
groupBox2.Visible = false;
treeViewAdv1_VisibleChanged(sender, e);
}
@@ -783,5 +807,37 @@ namespace OnDoc.DocMgmt
RibbonTextSearch.Text = "";
load_standard("");
}
private void toolstriptextboxsearch_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
load_standard(toolstriptextboxsearch.Text);
}
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
if (toolstriptextboxsearch.Text.Trim().Length > 0)
{
load_standard(toolstriptextboxsearch.Text);
}
}
private void toolStripButton2_Click(object sender, EventArgs e)
{
toolstriptextboxsearch.Text = "";
load_standard("");
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
toolstripCombobox_Fachverantwortung.Text = "";
}
private void toolstripCombobox_Fachverantwortung_SelectedIndexChanged(object sender, EventArgs e)
{
load_standard(toolstriptextboxsearch.Text);
}
}
}

42
Client/DocMgmt/DokTypSelect.resx
View File

@@ -283,9 +283,9 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
CAAAAk1TRnQBSQFMAgEBAgEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
DAAAAk1TRnQBSQFMAgEBBgEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
@@ -312,15 +312,30 @@
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMAAf8K8gH/IgAB/wHD
DJoBwwH/AgAB8gEHCPIBBwHyIgAB9A16AVkB9AIAAvIIAALyIgAB9A16AVkBwwIAAvIIAALyIgAB9A16
AVkBwwIAAvIBAAbvAQAC8iIAAfQNegFZAcMCAALyAQAG7wEAAvIiAAH0DXoBWQHDAgAC8gEABu8BAALy
IgAB9A16AVkBwwIAAvIBAAbvAQAC8iIAAfQNegFZAcMCAALyAgAB8AEAAfIC7wEAAvIiAAH0DXoBWQHD
AgAC8gIAAe8BAAHyAu8BAALyIgAB9A1ZATgB9AIAAvICAAHvAQAB8gLvAQAC8iIAAcMOOAH2AgAC8gEA
A+0B8gLvAQAC8iIAAcMGOAFZBvQB9gMAAvIIAAHxAfMiAAH0BjgBvQoAAvIHAAH0Ae8B/yIAAf8BwwSa
Ab0B/woAAfIBBwbyAfEB7wH/NQAB/wfyAfMB/yQAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEB
BQABgBcAA/8BAAL/AcABAwYAAcABAwYAAc8B8wYAAc8B8wYAAcgBEwYAAcgBEwYAAcgBEwYAAcgBEwYA
Ac0BEwYAAc0BEwYAAc0BEwYAAcgBEwUAAQEBzwHzBQAB/wHPAeMFAAH/AcABBwQAAv8BwAEPBAAL
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
</value>
</data>
<metadata name="contextMenuStripFavoriten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -329,6 +344,9 @@
<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>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAUAAAAAAAEAIADIHQAAVgAAADAwAAABACAAqCUAAB4eAAAgIAAAAQAgAKgQAADGQwAAGBgAAAEA

46
Client/DocMgmt/Dokumenterstellung.Designer.cs generated
View File

@@ -33,7 +33,9 @@
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();
this.label5 = new System.Windows.Forms.Label();
this.ribbonButtonVersandstrasse = new System.Windows.Forms.Button();
@@ -46,8 +48,6 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -83,6 +83,15 @@
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;
@@ -108,6 +117,18 @@
this.GrpFnkt.Text = "Funktionen";
this.GrpFnkt.Enter += new System.EventHandler(this.GrpFnkt_Enter);
//
// btnOfficePrint
//
this.btnOfficePrint.Image = ((System.Drawing.Image)(resources.GetObject("btnOfficePrint.Image")));
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
this.btnOfficePrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.btnOfficePrint.UseVisualStyleBackColor = true;
this.btnOfficePrint.Visible = false;
this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// label6
//
this.label6.AutoSize = true;
@@ -228,26 +249,6 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnOfficePrint
//
this.btnOfficePrint.Image = ((System.Drawing.Image)(resources.GetObject("btnOfficePrint.Image")));
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
this.btnOfficePrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.btnOfficePrint.UseVisualStyleBackColor = true;
this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// 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;
@@ -261,6 +262,7 @@
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;

13
Client/DocMgmt/Serienbrief.cs
View File

@@ -1483,17 +1483,14 @@ namespace OnDoc.UIControls
onbasedoc.dokumentDatum = db.dsdaten.Tables[0].Rows[0]["DokumentDatum"].ToString();
onbasedoc.dokumentTyp = db.dsdaten.Tables[0].Rows[0]["dokumenttyp"].ToString();
onbasedoc.dateiTyp = db.dsdaten.Tables[0].Rows[0]["dateityp"].ToString();
var Attribute = new List<Model.OnBaseDocUpload.attribute>();
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
{
var p = new OnBaseDocUpload.attribute()
{
fieldname = rw["fieldname"].ToString(),
fieldvalue = rw["fieldvalue"].ToString()
};
Attribute.Add(p);
OnBaseDocUpload.attribute p = new OnBaseDocUpload.attribute(rw["fieldname"].ToString(), rw["fieldvalue"].ToString());
onbasedoc.attributes.Add(p);
}
onbasedoc.attributes = Attribute;
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString(), false, true);
onbasedoc.dokumentDatei = db.dsdaten.Tables[0].Rows[0][0].ToString();
string URL = "";

6
Client/UIControls/DokList.cs
View File

@@ -593,9 +593,11 @@ namespace OnDoc.UICintrols
public void dokument_loeschen(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'");
db.Exec_SQL("Delete from dokument_trefferliste where dokumentid='" + dokumentid + "'");
db.Exec_SQL("Update dokument set aktiv=0, mutiertam=getdate(), mutierer=" + AppParams.CurrentMitarbieter.ToString() + " where dokumentid='" + dokumentid + "'");
//db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'");
//db.Exec_SQL("Delete from dokument_trefferliste where dokumentid='" + dokumentid + "'");
db = null;
Logging.DocLog.Info("Dokument gelöscht", "Doklist.Dokument_loeschen", dokumentid, "", "Dokument gelöscht");
}

1
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -190,6 +190,7 @@
this.GrpVerwendung.TabIndex = 23;
this.GrpVerwendung.TabStop = false;
this.GrpVerwendung.Text = "Dokumentvewendung";
this.GrpVerwendung.Visible = false;
//
// rbasPDF
//

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/Model.dll
View File

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/Debug/OFFEDK0082024002454520 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/OnDocOffice.dll
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/Debug/VBFileManagement.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.

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.

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

Binary file not shown.