update 20241125

Client/DocMgmt/DokTypSelect.cs

@@ -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);
+        }
     }
 }