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

Update 20250118

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-18 21:13:54 +01:00
parent cfd7c00451
commit bc996921a1
65 changed files with 1041 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
Client/DocMgmt/DokTypSelect.cs
View File

@@ -58,7 +58,7 @@ namespace OnDoc.DocMgmt
grpFavoriten.Visible = false;
grpVorlagen.Visible = true;
RibbonButtonVorlagen.Checked = true;
}
else
{
@@ -86,26 +86,61 @@ namespace OnDoc.DocMgmt
{
toolstripCombobox_Fachverantwortung.Items.Add(dr[0].ToString());
}
if (this.favoriten) {
if (this.favoriten)
{
RibbonButtonVorlagen.Checked = false;
RibbonButtonFavoriten.Checked = true;
RibbonButtonFavoriten_Click(sender, e);
}
else {
load_standard("");
toolstriptextboxsearch.Focus();
}
else
{
load_standard("");
toolstriptextboxsearch.Focus();
}
if (vorlagentype == 2) { this.ribbonPanel4.Visible = false; }else { this.ribbonPanel4.Visible=true; }
}
public void get_einzeldokumente(string where)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@manr", AppParams.CurrentMitarbeiter.ToString());
db.add_parameter("@where", where);
db.add_parameter("@einzeldokumente", "1");
db.Get_Tabledata("sp_ondoc_dokerstellung", true, false);
if (db.dsdaten.Tables[0].Rows.Count < 1)
{
db = null;
return;
}
TreeNodeAdv tnnativ = new TreeNodeAdv();
tnnativ.Text = "Dokumente ohne Archivierung";
tnnativ.LeftImageIndices = new int[] { 0 };
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
TreeNodeAdv tnnativ2 = new TreeNodeAdv();
tnnativ2.Tag = dr[0].ToString();
tnnativ2.Text = dr[1].ToString()+" [Ohne Archivierung]";
tnnativ2.TagObject = dr;
tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32(dr["apptype"]) };
tnnativ.Nodes.Add(tnnativ2);
}
if (tnnativ.Nodes.Count > 0)
{
treeViewAdv1.Nodes.Add(tnnativ);
}
db = null;
if (where != "") { tnnativ.ExpandAll(); }
}
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
int nodextoexpandindex = 1;
public void load_standard(string filter, string filter_fachverantwortung="")
public void load_standard(string filter, string filter_fachverantwortung = "")
{
Cursor = Cursors.WaitCursor;
if (AppParams.connectionstring == "")
{
@@ -136,6 +171,7 @@ namespace OnDoc.DocMgmt
}
}
if (vorlagentype == 1)
{
this.Text = "Vorlage auswählen";
@@ -173,7 +209,7 @@ namespace OnDoc.DocMgmt
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
// if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
// if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -192,9 +228,14 @@ namespace OnDoc.DocMgmt
}
}
catch { }
} else
{ treeViewAdv1.ExpandAll();
}
else
{
treeViewAdv1.ExpandAll();
}
db = null;
get_einzeldokumente(where);
}
else
{
@@ -236,9 +277,10 @@ namespace OnDoc.DocMgmt
}
}
treeViewAdv1.ExpandAll();
db = null;
}
@@ -353,7 +395,7 @@ namespace OnDoc.DocMgmt
//Recursively builds the tree
PopulateTree_Favoriten(dr, root);
}
}
treeViewAdv2.ExpandAll();
@@ -483,7 +525,7 @@ namespace OnDoc.DocMgmt
//toolStrip1.Visible = treeViewAdv2.Visible;
//if (treeViewAdv2.Visible == false)
//{
// this.Width = treeViewAdv1.Width + 10;
//}
//else
@@ -515,7 +557,7 @@ namespace OnDoc.DocMgmt
private void RibbonButtonVorlagen_Click(object sender, EventArgs e)
{
if (RibbonButtonVorlagen.Checked == true)
{
@@ -534,7 +576,7 @@ namespace OnDoc.DocMgmt
{
if (RibbonButtonFavoriten.Checked == true)
{
Load_Favoriten("");
favoriten = true;
treevisibility();
@@ -551,7 +593,7 @@ namespace OnDoc.DocMgmt
public void New_Favoriten()
{
RibbonButtonVorlagen.Checked = false;
this.favoriten= true;
this.favoriten = true;
RibbonButtonVorlagen_Click(null, null);
RibbonButtonFavoriten_Click(null, null);
@@ -564,12 +606,12 @@ namespace OnDoc.DocMgmt
private void treevisibility()
{
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked==false)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = false;
grpVorlagen.Dock = DockStyle.Fill;
}
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == false)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = false;
grpVorlagen.Dock = DockStyle.Fill;
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = false;
@@ -578,11 +620,11 @@ namespace OnDoc.DocMgmt
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == false)
{
grpVorlagen.Visible= false;
grpVorlagen.Visible = false;
grpFavoriten.Visible = false;
}
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = true;
@@ -917,16 +959,42 @@ namespace OnDoc.DocMgmt
{
System.Data.DataRow row = treeViewAdv1.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row["ID"]);
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
if (vorlagentype == 2)
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr, true);
dd.ShowDialog();
return;
}
if (treeViewAdv1.SelectedNode.Text.Contains("Ohne Archivierung]"))
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr,1);
dd.ShowDialog();
} else
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
}
private void detailsAnzeigenToolStripMenuItem1_Click(object sender, EventArgs e)
{
System.Data.DataRow row = treeViewAdv2.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row[6]);
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
if (treeViewAdv2.SelectedNode.Text.Contains("Ohne Archivierung]"))
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr, 1);
dd.ShowDialog();
}
else
{
DokTypDetails dd = new DokTypDetails(dokumenttypnr);
dd.ShowDialog();
}
// DokTypDetails dd = new DokTypDetails(dokumenttypnr);
// dd.ShowDialog();
}
private void DokTypSelect_SizeChanged(object sender, EventArgs e)