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

Update 20241118

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-18 15:21:58 +01:00
parent 69de21ca51
commit 194a97416c
120 changed files with 635 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Client/DocMgmt/DokTypSelect.cs
View File

@@ -71,6 +71,7 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
if (this.favoriten) { Load_Favoriten(""); }
else { load_standard(""); }
}
@@ -121,7 +122,7 @@ namespace OnDoc.DocMgmt
if (dr["Parentid"].ToString() == "0")
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -161,7 +162,7 @@ namespace OnDoc.DocMgmt
if (dr["bezeichnung"].ToString() == "Dokumentpakete")
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -213,7 +214,7 @@ namespace OnDoc.DocMgmt
foreach (System.Data.DataRow row in dr.GetChildRows("TreeParentChild"))
{
//Creating a TreeNode for each row
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString());
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString() );
cChild.Tag = Convert.ToInt32(row["id"]) * -1;
cChild.LeftImageIndices = new int[] { 0 };
cChild.TagObject = row;
@@ -221,7 +222,7 @@ namespace OnDoc.DocMgmt
pNode.Nodes.Add(cChild);
//Recursively build the tree
PopulateTree(row, cChild);
PopulateSubTree(row, cChild);
//PopulateSubTree(row, cChild);
}
}

12
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -100,7 +100,10 @@ namespace OnDoc.DocMgmt
private void sfButton2_Click(object sender, EventArgs e)
{
Cursor = Cursors.WaitCursor;
Dokument_Erstellen();
Cursor = Cursors.Default;
}
public void Dokument_Erstellen()
{
@@ -121,11 +124,11 @@ namespace OnDoc.DocMgmt
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice);
interop = ucAllgemeineDokumentParam1.interop;
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten || ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
@@ -133,11 +136,6 @@ namespace OnDoc.DocMgmt
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
DocFunction = 1;
//if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
//if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
//clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
this.Close();
return;
}

21
Client/DocMgmt/frmToApproval.cs
View File

@@ -57,6 +57,7 @@ namespace OnDoc.DocMgmt
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
@@ -64,13 +65,29 @@ namespace OnDoc.DocMgmt
pxapproval2.Visible = true;
btntoapproval.Enabled = false;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval1"]))
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval2"]))
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
}
private void btntoapproval_Click(object sender, EventArgs e)
{
DB dB = new DB(AppParams.connectionstring);
string sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbieter.ToString();
sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0";
dB.Exec_SQL(sql);
dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
if (pxapproval1.Visible == false)