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

Update 20250204

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-04 22:36:20 +01:00
parent 293b615547
commit 00eae8a837
2881 changed files with 1570876 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Client/UIControls/Approval.cs
View File

@@ -1,4 +1,5 @@
using Database;
using DOCGEN;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Edit;
@@ -192,8 +193,26 @@ namespace OnDoc.UIControls
{
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
db = null;
Logging.DocLog.Info("Dokument geprüft", "Dokumentprüfung", dr["dokumentid"].ToString(), "", "");
db.Get_Tabledata("Select * from dokument where dokumentid='" + dr["dokumentid"].ToString() + "'", false, true);
if (db.dsdaten.Tables[0].Rows[0]["approved"].ToString()=="True")
{
Cursor = Cursors.WaitCursor;
DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey);
if (dg.signdoc(dr["dokumentid"].ToString(), AppParams.tempdir))
{
db.Exec_SQL("Update Dokument set signiert=1, mutierer=" + AppParams.CurrentMitarbeiter.ToString() + ", mutiertam=getdate() where dokumentid='" + dr["dokumentid"].ToString() + "'");
}
dg = null;
Cursor = Cursors.Default;
}
db = null;
remove_node();
}

40
Client/UIControls/DokList.Designer.cs generated
View File

@@ -38,6 +38,7 @@ namespace OnDoc.UICintrols
this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -62,7 +63,6 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -162,8 +162,8 @@ namespace OnDoc.UICintrols
this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components);
this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -240,6 +240,14 @@ namespace OnDoc.UICintrols
this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung";
this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click);
//
// dokumentUnterzeichnenToolStripMenuItem
//
this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem";
this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentUnterzeichnenToolStripMenuItem.Text = "Dokument unterzeichnen";
this.dokumentUnterzeichnenToolStripMenuItem.Visible = false;
this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click);
//
// archivierenToolStripMenuItem
//
this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image")));
@@ -254,6 +262,7 @@ namespace OnDoc.UICintrols
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Visible = false;
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
@@ -470,16 +479,6 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -1347,6 +1346,16 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1355,13 +1364,6 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// dokumentUnterzeichnenToolStripMenuItem
//
this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem";
this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentUnterzeichnenToolStripMenuItem.Text = "Dokument unterzeichnen";
this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

68
Client/UIControls/Serienbrief.cs
View File

@@ -1328,6 +1328,51 @@ namespace OnDoc.UIControls
if (!Partnerliste_Pruefen()) { return; }
Generate();
}
private bool Check_Signature(int mitarbeiternr)
{
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select tgnummer from mitarbeiter where mitarbeiternr=" + mitarbeiternr.ToString(), false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "")
{
return false;
}
string URL = AppParams.RESTURI + "API/CheckSignature?TGNummer=" + db.dsdaten.Tables[0].Rows[0][0].ToString();
HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
webRequest.Method = WebRequestMethods.Http.Get;
webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
try
{
using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
{
if (response.StatusCode == HttpStatusCode.OK)
{
StreamReader reader = new StreamReader(response.GetResponseStream());
string responseContent = reader.ReadToEnd();
return true;
}
else
{
Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
return false;
}
}
}
catch (Exception ex)
{
return false;
}
}
catch
{
return false;
}
finally { db = null; }
}
private void Generate(int vorschauid = -1)
{
@@ -1374,6 +1419,29 @@ namespace OnDoc.UIControls
if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; };
bool error = false;
if (cbdigitaleunterschrfiten.Checked)
{
if (sb.unterschriftlinks != 0)
{
if (!Check_Signature(sb.unterschriftlinks))
{
MessageBox.Show("Unterschrift von " + cbboxunterschriftlinks.Text + " fehlt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Error);
error = true;
};
}
if (sb.unterschriftrechts != 0)
{
if (!Check_Signature(sb.unterschriftrechts))
{
MessageBox.Show("Unterschrift von " + cbboxunterschriftrechts.Text + " fehlt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Error);
error = true;
}
}
if (error) { return; }
}
imghelper = null;

78
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -24,6 +24,8 @@ using Windows.UI;
using edoka_dms;
using Syncfusion.Windows.Forms.Tools.XPMenus;
using Windows.Graphics.Printing3D;
using System.IO;
using System.Net;
namespace OnDoc.UIControls
@@ -136,6 +138,14 @@ namespace OnDoc.UIControls
this.cbboxunterschriftrechts.Enabled = Convert.ToBoolean(dr["unterschrift_rechts"]) == true;
this.cbformularohneunterschrfit.Enabled = Convert.ToBoolean(dr["unterschrift_ohne"]) == true;
if (cbboxunterschriftlinks.Enabled == false) {
cbboxunterschriftlinks.Visible = false;
lblUnterschriftlinks.Visible = false;
}
if (cbboxunterschriftrechts.Enabled == false) {
cbboxunterschriftrechts.Visible = false;
lblUnterschriftrechts.Visible = false;
}
this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
if (this.cbfaksimile.Enabled == true) { this.cbfaksimile.Checked=true; }
this.cbformularohneunterschrfit.Checked = false;
@@ -575,12 +585,32 @@ namespace OnDoc.UIControls
try
{
ur = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue);
}
catch { }
if (cbboxunterschriftlinks.Text == "") { ul = 0; }
if (cbboxunterschriftrechts.Text == "") { ur = 0; }
if (cbfaksimile.Checked) {
if (ul != 0)
{
if (!Check_Signature(ul))
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild "+cbboxunterschriftlinks.Text + " fehlt";
}
}
if (ur != 0)
{
if (!Check_Signature(ur))
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild " + cbboxunterschriftrechts.Text + " fehlt";
}
}
}
//20250121 - ausblenden
//if (ul==0 || ur == 0)
@@ -589,7 +619,7 @@ namespace OnDoc.UIControls
// check_error = check_error + "- " + "Bitte Unterschrift links und rechts auswählen";
//}
}
if (check_error == "") { return true; } else { return false; }
@@ -597,6 +627,51 @@ namespace OnDoc.UIControls
return true;
}
private bool Check_Signature(int mitarbeiternr)
{
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select tgnummer from mitarbeiter where mitarbeiternr=" + mitarbeiternr.ToString(), false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "")
{
return false;
}
string URL = AppParams.RESTURI + "API/CheckSignature?TGNummer=" + db.dsdaten.Tables[0].Rows[0][0].ToString();
HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
webRequest.Method = WebRequestMethods.Http.Get;
webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
try
{
using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
{
if (response.StatusCode == HttpStatusCode.OK)
{
StreamReader reader = new StreamReader(response.GetResponseStream());
string responseContent = reader.ReadToEnd();
return true;
}
else
{
Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
return false;
}
}
}
catch (Exception ex)
{
return false;
}
}
catch
{
return false;
}
finally { db = null; }
}
public void Update_DocGenData()
{
@@ -1046,6 +1121,7 @@ namespace OnDoc.UIControls
this.DateDokumentDatum.Value = Convert.ToDateTime(dr["erstellungsdatum"]);
this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString();
this.signiert = Convert.ToBoolean(dr["signiert"]) == true;
this.cbfaksimile.Checked = Convert.ToBoolean(dr["faksimile"])==true;
if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString();