Update 20250204

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

View File

@@ -420,6 +420,9 @@
<Reference Include="WindowsFormsIntegration">
<Private>False</Private>
</Reference>
<Reference Include="WinSign">
<HintPath>..\WinSign\bin\Debug\WinSign.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Diverses\DokHistory.cs">

View File

@@ -54,6 +54,11 @@
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.GrpBoxMitarbeiter = new System.Windows.Forms.GroupBox();
this.GrpGetSignature = new System.Windows.Forms.GroupBox();
this.btnDeleteImage = new System.Windows.Forms.Button();
this.btnSaveSignature = new System.Windows.Forms.Button();
this.sign1 = new WinSign.Sign();
this.chkOndocMails = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button();
this.btnLoadImage = new System.Windows.Forms.Button();
this.label12 = new System.Windows.Forms.Label();
@@ -73,13 +78,17 @@
this.lblVorname = new System.Windows.Forms.Label();
this.txtName = new System.Windows.Forms.TextBox();
this.lblName = new System.Windows.Forms.Label();
this.chkOndocMails = new System.Windows.Forms.CheckBox();
this.button2 = new System.Windows.Forms.Button();
this.GetSignatureAbort = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.GrpBoxProfile.SuspendLayout();
this.GrpBoxDetails.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftRechts)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftLinks)).BeginInit();
this.GrpBoxMitarbeiter.SuspendLayout();
this.GrpGetSignature.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
@@ -332,6 +341,7 @@
//
// GrpBoxMitarbeiter
//
this.GrpBoxMitarbeiter.Controls.Add(this.button2);
this.GrpBoxMitarbeiter.Controls.Add(this.chkOndocMails);
this.GrpBoxMitarbeiter.Controls.Add(this.button1);
this.GrpBoxMitarbeiter.Controls.Add(this.btnLoadImage);
@@ -358,6 +368,67 @@
this.GrpBoxMitarbeiter.TabIndex = 3;
this.GrpBoxMitarbeiter.TabStop = false;
//
// GrpGetSignature
//
this.GrpGetSignature.BackColor = System.Drawing.Color.Gainsboro;
this.GrpGetSignature.Controls.Add(this.label14);
this.GrpGetSignature.Controls.Add(this.label13);
this.GrpGetSignature.Controls.Add(this.GetSignatureAbort);
this.GrpGetSignature.Controls.Add(this.btnDeleteImage);
this.GrpGetSignature.Controls.Add(this.btnSaveSignature);
this.GrpGetSignature.Controls.Add(this.sign1);
this.GrpGetSignature.Location = new System.Drawing.Point(101, 99);
this.GrpGetSignature.Name = "GrpGetSignature";
this.GrpGetSignature.Size = new System.Drawing.Size(644, 364);
this.GrpGetSignature.TabIndex = 21;
this.GrpGetSignature.TabStop = false;
this.GrpGetSignature.Text = "Unterschrift erfassen";
this.GrpGetSignature.Visible = false;
//
// btnDeleteImage
//
this.btnDeleteImage.Location = new System.Drawing.Point(11, 327);
this.btnDeleteImage.Name = "btnDeleteImage";
this.btnDeleteImage.Size = new System.Drawing.Size(103, 23);
this.btnDeleteImage.TabIndex = 22;
this.btnDeleteImage.Text = "Bild löschen";
this.btnDeleteImage.UseVisualStyleBackColor = true;
this.btnDeleteImage.Click += new System.EventHandler(this.btnDeleteImage_Click);
//
// btnSaveSignature
//
this.btnSaveSignature.Location = new System.Drawing.Point(498, 327);
this.btnSaveSignature.Name = "btnSaveSignature";
this.btnSaveSignature.Size = new System.Drawing.Size(129, 23);
this.btnSaveSignature.TabIndex = 21;
this.btnSaveSignature.Text = "Unterschrift speichern";
this.btnSaveSignature.UseVisualStyleBackColor = true;
this.btnSaveSignature.Click += new System.EventHandler(this.btnSaveSignature_Click);
//
// sign1
//
this.sign1.BackColor = System.Drawing.Color.White;
this.sign1.BackgroundImageBitmap = null;
this.sign1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.sign1.FileFormat = System.Drawing.Imaging.ImageFormat.Bmp;
this.sign1.Location = new System.Drawing.Point(11, 93);
this.sign1.Name = "sign1";
this.sign1.PenColor = System.Drawing.Color.Black;
this.sign1.PenWidth = 4;
this.sign1.RequiredPoints = 20;
this.sign1.Size = new System.Drawing.Size(616, 228);
this.sign1.TabIndex = 20;
//
// chkOndocMails
//
this.chkOndocMails.AutoSize = true;
this.chkOndocMails.Location = new System.Drawing.Point(29, 257);
this.chkOndocMails.Name = "chkOndocMails";
this.chkOndocMails.Size = new System.Drawing.Size(128, 17);
this.chkOndocMails.TabIndex = 19;
this.chkOndocMails.Text = "OnDoc-Mails erhalten";
this.chkOndocMails.UseVisualStyleBackColor = true;
//
// button1
//
this.button1.Location = new System.Drawing.Point(628, 208);
@@ -520,21 +591,52 @@
this.lblName.TabIndex = 0;
this.lblName.Text = "Name";
//
// chkOndocMails
// button2
//
this.chkOndocMails.AutoSize = true;
this.chkOndocMails.Location = new System.Drawing.Point(29, 257);
this.chkOndocMails.Name = "chkOndocMails";
this.chkOndocMails.Size = new System.Drawing.Size(128, 17);
this.chkOndocMails.TabIndex = 19;
this.chkOndocMails.Text = "OnDoc-Mails erhalten";
this.chkOndocMails.UseVisualStyleBackColor = true;
this.button2.Location = new System.Drawing.Point(386, 208);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(147, 23);
this.button2.TabIndex = 22;
this.button2.Text = "Unterschrift erfassen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// GetSignatureAbort
//
this.GetSignatureAbort.Location = new System.Drawing.Point(524, 19);
this.GetSignatureAbort.Name = "GetSignatureAbort";
this.GetSignatureAbort.Size = new System.Drawing.Size(103, 23);
this.GetSignatureAbort.TabIndex = 23;
this.GetSignatureAbort.Text = "Abbrechen";
this.GetSignatureAbort.UseVisualStyleBackColor = true;
this.GetSignatureAbort.Click += new System.EventHandler(this.button3_Click);
//
// label13
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(11, 31);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(198, 17);
this.label13.TabIndex = 24;
this.label13.Text = "Unterschrift mit Stift erfassen. ";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label14.Location = new System.Drawing.Point(11, 53);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(400, 17);
this.label14.TabIndex = 25;
this.label14.Text = "Bitte möglichst den gesamten Paltz des Eingabefeldes nutzen.";
//
// MitarbeiterProfil
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 498);
this.Controls.Add(this.GrpGetSignature);
this.Controls.Add(this.GrpBoxMitarbeiter);
this.Controls.Add(this.GrpBoxDetails);
this.Controls.Add(this.GrpBoxProfile);
@@ -556,6 +658,8 @@
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftLinks)).EndInit();
this.GrpBoxMitarbeiter.ResumeLayout(false);
this.GrpBoxMitarbeiter.PerformLayout();
this.GrpGetSignature.ResumeLayout(false);
this.GrpGetSignature.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
@@ -608,5 +712,13 @@
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.CheckBox chkOndocMails;
private WinSign.Sign sign1;
private System.Windows.Forms.GroupBox GrpGetSignature;
private System.Windows.Forms.Button btnDeleteImage;
private System.Windows.Forms.Button btnSaveSignature;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button GetSignatureAbort;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
}
}

View File

@@ -19,6 +19,13 @@ using System.Threading;
using static System.Net.Mime.MediaTypeNames;
using System.IO;
using System.Net;
using Windows.System.Update;
using Syncfusion.Windows.Forms;
using OnDoc.Helper;
using Windows.Phone.ApplicationModel;
using System.Net.Http;
using Syncfusion.Office;
using Newtonsoft.Json;
namespace OnDoc.Diverses
{
@@ -26,6 +33,8 @@ namespace OnDoc.Diverses
{
private int mitarbeiternr = 0;
private bool onLoad = true;
private string tgnummer = "";
public MitarbeiterProfil()
{
InitializeComponent();
@@ -197,8 +206,10 @@ namespace OnDoc.Diverses
db.Get_Tabledata("select * from mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
try {
string unterschrift = get_unterschrift(db.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString());
try {
tgnummer = db.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString();
string unterschrift = get_unterschrift(db.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString());
string ss = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(unterschrift);
MemoryStream mssign = new MemoryStream(Convert.FromBase64String(ss));
System.Drawing.Image img = System.Drawing.Image.FromStream(mssign);
@@ -326,6 +337,110 @@ namespace OnDoc.Diverses
db.Exec_SQL("Update mitarbeiter set mailempfang=" + mailempfang.ToString() + " where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString());
db = null;
}
private void btnDeleteImage_Click(object sender, EventArgs e)
{
sign1.ClearSignature();
}
private void btnSaveSignature_Click(object sender, EventArgs e)
{
if (sign1.IsValid)
{
string filename = AppParams.tempdir + AppParams.currenttgnummer + ".jpg";
if (System.IO.File.Exists(filename))
{
System.IO.File.Delete(filename);
}
if (MessageBox.Show("Unterschrif-Bild speichern ('"+AppParams.currenttgnummer+".jpg' ?","Unterschrift speichern", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
sign1.SignatureBitmap.Save(filename, System.Drawing.Imaging.ImageFormat.Jpeg);
//FileStream fs = new FileStream(filename, FileMode.Open);
// upload_img(fs, filename, AppParams.currenttgnummer);
FileHelper fh = new FileHelper();
string userimage = fh.Base64FromFile(filename);
upload_image(userimage, AppParams.currenttgnummer);
sign1.ClearSignature();
GrpGetSignature.Visible = false;
string unterschrift = get_unterschrift(this.tgnummer);
string ss = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(unterschrift);
MemoryStream mssign = new MemoryStream(Convert.FromBase64String(ss));
System.Drawing.Image img = System.Drawing.Image.FromStream(mssign);
pictureBox1.Image = img;
mssign.Close();
mssign.Dispose();
}
}
}
public class imageclass
{
public string tgnummer { get; set; }
public string b64 { get; set; }
}
private void upload_image(string unterschrift, string tgnummer)
{
Logging.Logging.Debug("Start Save Image", "OnDoc", "");
string URL = AppParams.RESTURI + "API/SaveSignature";
string response;
imageclass ic = new imageclass();
ic.tgnummer = tgnummer;
ic.b64= unterschrift;
string jsonstring = JsonConvert.SerializeObject(ic);
WebRequest request;
var data = Encoding.UTF8.GetBytes(jsonstring);
request = WebRequest.Create(URL);
request.ContentLength = data.Length;
request.ContentType = "application/json";
request.Method = "POST";
request.Headers["Authorization"] = "Bearer " + AppParams.apikey;
try
{
Logging.Logging.Debug("Upload Signature " + tgnummer, "OnDoc", "");
using (Stream requestStream = request.GetRequestStream())
{
requestStream.Write(data, 0, data.Length);
requestStream.Close();
using (Stream responseStream = request.GetResponse().GetResponseStream())
{
using (var reader = new StreamReader(responseStream))
{
response = reader.ReadToEnd();
}
}
}
return;
}
catch (Exception ex)
{
Logging.Logging.Debug("Upload Signature failed:" + ex.Message, "OnDoc", "");
return;
}
}
private void button3_Click(object sender, EventArgs e)
{
GrpGetSignature.Visible = false;
}
private void button2_Click(object sender, EventArgs e)
{
GrpGetSignature.Visible = true;
}
}
}

View File

@@ -121,7 +121,7 @@
<data name="RibbonButtonExit.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -52,9 +52,9 @@
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(164, 304);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(134, 26);
this.label1.Size = new System.Drawing.Size(122, 26);
this.label1.TabIndex = 1;
this.label1.Text = "Version 0.95";
this.label1.Text = "Version 1.0";
//
// label2
//
@@ -62,9 +62,9 @@
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(144, 330);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(168, 26);
this.label2.Size = new System.Drawing.Size(165, 26);
this.label2.TabIndex = 2;
this.label2.Text = "30. Januar 2025";
this.label2.Text = "4. Februar 2025";
//
// SplashScreen
//

View File

@@ -228,7 +228,7 @@ namespace OnDoc.DocMgmt
//Bearbeiten
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
Logging.Logging.Debug("Dokumentbearbietung Erstellungsart.DokumentBearbeiten", "OnDocClient", "");
Logging.Logging.Debug("Dokumentbearbeitung Erstellungsart.DokumentBearbeiten", "OnDocClient", "");
//string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
string filename = AppParams.tempdir + dokumentid + "_Erstellt_." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
@@ -251,7 +251,7 @@ namespace OnDoc.DocMgmt
}
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentPreview)
{
Logging.Logging.Debug("Dokumentbearbietung Erstellungsart.DokumentBearbeiten", "DokumentPreview", "");
Logging.Logging.Debug("Dokumentbearbeitung Erstellungsart.DokumentBearbeiten", "DokumentPreview", "");
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
@@ -260,7 +260,7 @@ namespace OnDoc.DocMgmt
}
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF)
{
Logging.Logging.Debug("Dokumentbearbietung Erstellungsart.DokumentAlsPDF", "DokumentPreview", "");
Logging.Logging.Debug("Dokumentbearbeitung Erstellungsart.DokumentAlsPDF", "DokumentPreview", "");
//Generator.DocToPDF(dokumentid, ref dok);
dok.extension = "pdf";
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
@@ -388,5 +388,10 @@ namespace OnDoc.DocMgmt
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
}
}
private void label8_Click(object sender, EventArgs e)
{
}
}
}

View File

@@ -120,134 +120,133 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ribbonButtonArchiv.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
DQ0zS3vVPkEAAAAASUVORK5CYII=
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADVtJREFUaEPV
mXlwVFd2xlllMHZlXGNXTTKZZDL/TJIZ2+MQT00q8WDAxK6aMRKLehGYmUFeQFJ3C2QbsPEQWQvYWpEQ
WIgdm9Xs1kazaMEGJCGhBRAgsWpB+9bq7re0fqn7mnbkVktIjEkqp+qr1++9e+4937vnnnPu7VF9fX0I
8Vw9vwfDSMRb91FgVP+b4Qw8EvHWfRT4DgGBBw08EvHWfRTQCHgGG87AIxFv3UeBUd6DCvFu1B8jEW/d
R4EBLvQg9BfZ5UJWFRRFpdcpcbH2NhnHC7Bs3IV/1Hpm/DmZVz5K4vfR6zFv2cvGkwVU1N6mt1dCViRc
qoJLVQeMMRL8ZQQUhdvNLaw+cIRnw2OYGBTOaIOJUUYTow1mRhssGkYZLIwxhjNOZ+bxIAu/iogi6WAW
d9vaUZX/ZQJ9ioSiyCiyk91nzvKT4PcZa1zCWIOZMcLoILfhwmgPPPejjaJNOGP0SxirM/HTt5dx4PRZ
HIqC8pAzMWICisvJpZZKsqqzKLx8mYnGUMYYhYFmDaONwtD70Jk1eN71x1i9mcf1Zk6WXqaqvoz6njuo
D0FieARcLtQ+BVmWOHM7j+ATC/iDVceN1lr8Y9IYH7SEcXqLhifmWfh5yEe8GrWW+UmbNbwWlco/hqxi
otHEWH04Y0VbXTiv/FcSLbZW0kviyChJ5HrLFfdMqH24+oZHZlgEVJeKS3Fx/EYWhuNz0eUGYMj2J/HC
p5wov8xEXSgvvvsxaZknqb57B5vDqZF1KE6ciowsO+ix26m+20jSsRO8sCSKJ/QmcovLOF5zlHVFsawr
iiG9OI7qpisoijLs2RgWAVmSOFtfwBs5c9HnzESX609Q9kyMx/0pv1fO6dIKum12VFcfLtWF6lJQ+1RU
8Vvt065atLl/7bE7yDpfyu3WO6QVrSHt/GrWnY8hpSiWDcWfUNt2XYts3nb4gs880F9Eo5vttSzOXYAu
eyaG3ACMuf4E5voTdz6Wlp5G7Wt5vpi3ri+4hEuqKu2Odg5d2s3a4ihSimJIPR9LalEsW0vSaOtt1dp5
63pjcAJ9aB3YJTuRZz7EkDMTQ44/hpwAjDkBbCpNw+bs1r5o/4G+04WPAftD6PY6beReO0JqsTB+tZvE
+WgOXvoCp+x8IInBCQCqIpN1/Sj6HH8Nuhz3l08sicNm79K+4lDiPZgvCH+3O20cvbqXdUXR2noQs7D2
XDRVDWUoqjxAZ1gExMs2RxuL8xZ+S8BgncXKvKV02NpQFeU7HfkS78EGg6IqdNs7+Lx8A8klkRoB4VI7
LqZhk3oHtO+PQQmIr/vV9YME5swkKHc2QTmzCMqZw5XmCm2hCmXhZp6OfIn3YA/CrfZrrC/+hLSi1RpS
z6+hovH8kNl6UAKSLLG6KArzqUWEnn6TsLy3yLiYjux0T+lwxHuwB0Fk95PXMtlxcT3bBco/I/PqQc3N
vNt6MCgBLVK4JFRVcV9dErJLweUaGG2EeHfs69mD4U6YkiJpUPtcKH2DGy8wKAEhnnDnaeyJCL7E875/
G+/BRoIHRR8PfBJQRZksy1TeqSN2zzEiMr5gY9Ypmjs6tQwrFPuLuBdEy6/X8sH2AyzdtJuPtu/hyzNn
6e61a+8GGORylyja1Ydhw4VvAorKl1+X8Mz8cPx0ZibplzDBEM6L4THcvtfs0yBxvzE7T6tzfrxwOT/5
03LGB5l4K2kzkixczz07/Wepv+5Q8DZ6SALiYWtPDz9ftIInDUtZn3WC0pprvLl2C376pbydug1Jcmob
GVmStWTjFP6qqmzJLmCMzkxGZh4NrR1MDo/kmT9G0NjegSQ7kRUZpyojSw73RkhV3X2J8lyRkbQyXdbu
PetAeIJGxIfxGgHvB6LxibJLPBYYxqw163A4e7FLTupa2vjrBe/x07eXsz23AP/ItRwuLmfGynheWh7P
gXMlbM4pZIzexNbc09gddl6PTuZHwe9xr6ObnacKeOXPyUy2RKKLWcuFmlqt78+y8/nt8k/5t4g4glO2
Y3f0kFd1hdej0pi8NAbzxs+pb2vFKftOaD4JrD1ixS/QTNT+w9jFF1EVu6Qo/GZZLH9lsGBJ38lYwxJ+
+EYE/xQWyQSDmX8Ifo/Eg8c1AvM+3cji9C94ZkEEK7fv1wxNOnKc16JSCFy9gafnR/B8WCRZJeVM0ofx
63djeCt1C0HJ6ZTdvM3T89/lF6ZVBH6SwiSDBWN8OpLkXnve8Ekgds9XjNNZSD5qFRWkXYQ38W7KB3FM
NJoJXb+D0YZwPtzxJd2OXn4XnczjujBWbNvH6EATTwWF8/T8ZTyhtxCcupmWjnZs9l4a29q4WHObwLgN
PGE0aQvdzxBGePoO6tqa6OrtYdUXB5k4N4y8qmu0dHQyPymDJwNDae3uGmD8oARSMk8yTh9G9O7D7mJN
VbVkMjkikh8ELeG9jD2MCbSQXVyurQFz+i4mzDXx/uY9jNaZWH/sJHVt7SzfvA+/QAtrDn5F+rFcfvzm
+/wgyMTjBjMTDRYOnTnHzxYu1dz1b/64gg927Ef/6Xrt4/198DL+buEynvrDUvxmh3C9vnGA8YMSyK+6
ymNBYfzu47X02m04JCfX77Xw9Pyl/Oyd5cTuO8aYwFCspVUi5JYtydjNY4GhrNh8gNF6C1uOFyI7JfIv
VTNeH0LgJ2n8aMESZkQmc6OhgfCN+5igt1BaW0tjazvpuad4NiwSv0CTNssTDCaSj55gW3YeO44XsiXT
SofNPsD4QQl09dr5F9MqnjSGE7M3k9PlVQTGpjDBYGH5lv0kHs5h9NxQrGWXfBKI2XuUoqu1GOI2MD7Q
TGjaNp6aF8FrkYlcv9fEovQ9TNSFcPJCOSXVtdQ0NGCM+4zxcxazVPQ118TyLXu4XNfAxRu3KL5Wo0Ur
b1t9EtBIqCp5ldf424URjNUtYtzcEMYFmvjPVQlaMks4mKtt1q2llaiKpFrSP2ecfjHvb9rHWL2JsaL9
3FD8jKFMNq+k+m69thDH6BczyRCG39wwJhnNhKRuY9ycxUwyhuAXuAhjXBoNbW1MXb4GP72J8XNDGa9b
TEBUMpLTMcDOIQmoskRDawu7Tn1N0jErOSUV2O29WjS4crOOndavtekXbUuu1bAr/xtKa2rYai1g3VfH
Scu0cuR8Ge22bhSnU8vImUVlpB49waac0+RXVHGjvpHPTxeSesxKdlEpNrtdc73O3h4OfVPChmNWtlrz
qLx1V9vWets5KAFP1FFcqpaVRb0ufouTAlFgeWdHT4Hnfv4/tZM4DBDlgkvTcZcPnoQk2oqSRSvN75cU
YgyxF1YV6a6sSjcV1aUlNe0Eb5CMPAgBd21jkyV6FQmbrNAjKzhUd2febb8viMzb7XTQ5nR0tTkdHS2S
k3aH0/0hfLQX8ElAsBVhc/v1ZhKq7hFfIdDE4VstOF2PhoDa10ev7GBReSO/LmzgN4WNvPjNHcxldchD
HLH4JKB1qKqUNnXycUUzseVNxJTfI66ykZqOnm93ZN8XhCuJ8bIaO/ll3l2ey6vn2dN1/LKgnsMN7nXm
rePBoAQEbA6ZjKvNxFY0sbqyheiqJjZWN9HpdBdv3u0fBmJNiNm+YbMx/Zt6nj/lIVBPYFETnQ7HoP4v
MCQBYWRJSzerq1qIrrx3n0gze262YXe6q0RvnZFAqzIVlSZ7L/Mu1LkNz6vj+bx6fpFfx8l7Hbhcvos4
D4YkIKsu7IqT/TXNRFe0aAQ0EhX3OHirFZsk/0UbElFONzscvHPhDs/lN2lu81x+Pc/lNRBR3oB0v+z2
1uuPIQl40GKXSL3Uqhkv1oKHyM7qJlrt4hxU7A9EohnejIg/N5ySjctd7ZqbaIbn1fNCfj2/yqvn9XN1
3O1y7+S8db0xLAJ9skxtl4O4SrfhHiRdaeN2ZwfZF47S1dPx7RGj5hr93Mtz7479Ks09rZyqsHKmqYMX
8u98S+Cfz9Tz0td3KOnoQlac3x8B0ZFYaBWdduKrhAu5CRQ0dpJZdJiAhJcI3mhk+8kMKu+U0mXrcO+0
ZEnbYTllifaedi7eLGarNYXgDXOYk/gKpbdKiKhs4vm8Bg3/XlBPXlu3O3n5sMMXhkXAA1WVudrZTcql
JtZdbqKlp52QTQYCEqYTkPAyM+On4R83nXlpM7Fse5MP91r4cI8Zy7ZgjGm/Z2b8dGYmTWd2/FRmJU7j
40MrudLZyb/m1/Nq4V1KWm0oytBRxxsjIiAgMnGTXaK2o5vsskP4x7+Ef8IMZsa/zCxhWPzLzI6fRkD8
VAISpxCQ+DIB8VO057MSprqfJwii05gdP53qukr21TVx2yb2xsqQp3C+MGICAlqxp8gUXrLyTsYbzPrk
PzRD/eOn4h8njBQEpmmzokE81zCFgITfun8nTCNk0xtcvF6ibfidyuD1zlB4KAIi2ojCThyXdNhasV48
yopdJnTxM3g97r7B942flSCITcE/cRr+CVPQJ73KR7sjOF2RS3dvp3ayIYo2UfANHOfBeEgC34VWO4no
Ymvi7LVC9p3ZyWZrGptOpJJxIoUt1vV8eXYXJTXnaLM3u//BeUB8Hy6+FwL/l/h/T+C/AQ0NM0vZxkRr
AAAAAElFTkSuQmCC
</value>
</data>
<data name="button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABK1JREFUaEPt
mluoVVUUhvdYp7wEliKmXalERTGKHvItrSChG5R5194SKRFSBMsMfKkoeklBQpIu1EPRQ9SDD6ZmIgZl
qRCoGSkaUoRFlse08v/nHnM5zjx7rrX2OXOv7YM/fmz3vI6x1ryMOfdpNCWPg33gfKOR/Y/PAphfFVen
F3wDngOjtcOUkscADLfGWYNDrIFl9Kt/EjyoHaeS7DUdgJYdG0Iji2hZ/wzAQ0smvuK8s4mNRs9V+F4A
86vC8rJb27b8AzBskyg7B9Co4xpNTCjZZQznfLD/n62FBiOBA3mjnXZgKfjRfKcTc7TgQFWrAw+AW8AP
Jo39z9XCA1HdDri00ImzYEEzr211wwGKTmSHTd5AneiWA1R2M9IOmnzuR/M0s6q66YDTTUi3TvwFJmte
FUUdyPD9GXxsrIa8Bm7QukbyKfDt74zUtWXI+1q5imL7gDxq0isiH2tlI1msRrXDaXC1NlCmqAP3gn9N
XgVks1a26kH6hmZbLY2NcbfWL1N0Jxb8mwlWgJUVeAp1RjSr9hPbugss07IRsqP49A7gAVZSp0OJdpTt
ueyAJnZJSR0QjlvGLs92iCXoJFhp0jowA7S5CoXkxsQI1vu0DmAfYEPekLxMG+TGxPhMO1OlnQPcibHs
ZW92BnkdMBYaB54GHyL9T3x6B74G3N3vAdhLourWJJaxgGHE38AbHeM78AgrNev2UaeDuVaS+wFvKKyR
ZXAnfwsM00a86nZAZgHG/r7P/wDvjVYBDpdJ4A6AU5q8DRgX+bJkKxoZ3mzLqcgB3lLIQwl5EjBc9v3x
LfBgj/kWk9wIPtLynneZ0cyPOuBilzMmLzVHwG3aWZm4oLxs6vKt+RuNqAN8hT49NXwLU7SjquLG+oHW
J4eQNoTpsSGEySJvgM/BtkGyHdh+XtQ+CiQTwDT9onIr1yng23mYiQVzIJXcXPLnAT79MZpB8cnipCZf
gOs0CUdK+RX04ostC8l64O3dxIQ6HFho+sAbtRKOb3878RO4z3zHUZMHIisXn/m29jOhDgeeN33gCYbi
WVq+0nxOUH5+C1ocK92q5Nv6gwl1OLDuYh/ZK5oYiH3LiYvlZI1mBJJRpgz2k3oc4LHU94HdtJ84D17S
fG5y/i3Q2XAIcXL7tn5hQh0OII7J+0BcE8Y0bo5wktMWRsE8O/MKnuV5bjDi7V3e1i4m1OHAtcBfrdPQ
qZqhklcBn/pyTYDczs3VKbidkE+AtxebW1oHhmKMw9ieFsgO0w9CZyu5AozXLwWiM7m9fBB3MjGRA251
sHf/RfBpL9KKVTUSdQ6YNrYgjUMxmQPthh6Ms+Zr5RJx4+tzx8ozxO0+M9UQ4vL2Jfi9gN8AVo68P76J
d0AsqMOQdBGsXV5Zx07spHOAYmgcg8slxjoDsbxPwhWHoQQnM2/pXgDvgZ+BLcdxvxrtWCV3oILckLCr
SRUYGz2hDVh1wwEnvg0ulXzy1oYQHnp4Foj9yt81B4zkVrAYo+yYsYVRJ4+Y4Rk4VJ/fbnEeDX/Yro0R
4Htjy3Q1sEzhnxpcEjAeul4NLJP9Y49LBpwE25L7cxteHnXTEa7vx8FacKUaVqJG4wJccl5y/LtKDwAA
AABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABIJJREFUaEPt
WkmoHUUUPae+mijEATFxJhpiiCiKC92pUVBQE4izcdgpokFQCWgcwI0RxU0iiEjEAV1EXEhcuDCOQRTU
RAXBkShGRBEVjTHGidPV/f/t26/69/fV65eFBw7//a6qe+/pmm7Ve0ABXgjwfYB/AuEfgC1UeVcWbX4H
+C7A2wEeHP1lBZfHwG1wPuihBFh+C/A8H8GQ4HvNABuOcwnQ851AWO6jGALq4klnxwET+wGhhSrvStXn
m00R/CMO2ywIu81bO8CXDg9uNoFrPtjPl/ja/wHcbYyOWsD1AL9wIi71LWaIXgWcA3A+wM/MM/m/zLea
AfoWUDzzInYBXOFbdsQ4BBTP5wPh0wwixiVACEcD/NiUaz+6vF5nWoxTQIGjnIgdABf7Si1ICggAbwTC
w93IBwAeYdqX4EZj//Vmu6KtrSM+7a20ILUPcFlzZ52OfM5aLu1c7YLrwl8B7u8tJZAUsATgX80g28jH
rOUSEwAfirYagbbxVG8ogZQAEOC5AG8BeGsHXgtgjmlvIVunAFw5oJ1h+NIIWOKNJJAUMAaEt/4X4Ev7
RVYB1LhV7nLziHgdALfS5BVw5sxXIc/GyuLp1vu8ApZFQ1UgPrgubATs+YKNJLOAYideCYRHRkM+CFC5
0KEAbwC4AQi/GAHvlLv76QAnTFweSQEjBucBVBrx24Ce8dwKcGncTxpI5kIjBM8ubyh8oG3UTr4e4Gxv
rGcBvKjM/Suff5f3RqvK4bII4EnxlMbHy7zICnkJwL7WYIsA3VLw/Iy8pkyXK3/qBR3sQ92vBY8E+KwT
8aQZTikBRe6y0zXMyc8BHjvlrxVaUNaYtuq16kYjKUBd6J3monrh+ClfnaCN9Rlj4xMA+7QIwGyAawFu
AvjykHzF+bnb+EmACwGe5p5p5frR2LmgTUBGFHOpOg/o7R9iC+NJja8BPKx8tBjg9/HeCLauytaZeB/t
S8CVxscmV6bxXd1ObAN4lvl/YzwQ1eorP6tsfdCXgNXGxzpfGs/SfLss1wTV3y2Dj5XFqlTZ+rkvAfdM
+Qj3+dII+eZ2E8sdvkYEDzJ1dvUlQMfSysd6X6oKAO+dCmqyFyTWDyFN7srWd30JWGp8bI0B18o1RzTJ
FYuyYJ2ddQWv+jo32LorjK3NfQmYa67WFegJrvz+8q3fZJ5p59bq5G4n+LyJd01uAbOAMBeYGEC+avxs
qDfjXgAX1J8NgsRMxqsXcXJGAcXqYO/+26i3fZW3MA0OBPihsfFiORSzCZhp6qE86wpvZTC08dXuWHWG
OLEqzCQAWt7eAPhTC3+IK8ekP/XEEy1J3awyg7XLq9rYiZ1NQAWlxilquVwQE7Fab2jFUSqhyaxbujsB
PgXwG1dP4/425y+7gA4ohoRdTbpQudHF3tKYBBRQb2ip1Ju3MXjq0KOzQOpb/rEJMOAx8Ro+fGViUdap
I6Y/A3vUvrtd1PxiuzfOAcJHJpYzfKQJ+J8a7BFUPnS4jzQB+2OPPYZrfZTToPi5jS6PxilE6/vXAO8C
uLePMIV/AVxyXnJs/RKjAAAAAElFTkSuQmCC
</value>
</data>
<data name="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABK1JREFUaEPt
mluoVVUUhvdYp7wEliKmXalERTGKHvItrSChG5R5194SKRFSBMsMfKkoeklBQpIu1EPRQ9SDD6ZmIgZl
qRCoGSkaUoRFlse08v/nHnM5zjx7rrX2OXOv7YM/fmz3vI6x1ryMOfdpNCWPg33gfKOR/Y/PAphfFVen
F3wDngOjtcOUkscADLfGWYNDrIFl9Kt/EjyoHaeS7DUdgJYdG0Iji2hZ/wzAQ0smvuK8s4mNRs9V+F4A
86vC8rJb27b8AzBskyg7B9Co4xpNTCjZZQznfLD/n62FBiOBA3mjnXZgKfjRfKcTc7TgQFWrAw+AW8AP
Jo39z9XCA1HdDri00ImzYEEzr211wwGKTmSHTd5AneiWA1R2M9IOmnzuR/M0s6q66YDTTUi3TvwFJmte
FUUdyPD9GXxsrIa8Bm7QukbyKfDt74zUtWXI+1q5imL7gDxq0isiH2tlI1msRrXDaXC1NlCmqAP3gn9N
XgVks1a26kH6hmZbLY2NcbfWL1N0Jxb8mwlWgJUVeAp1RjSr9hPbugss07IRsqP49A7gAVZSp0OJdpTt
ueyAJnZJSR0QjlvGLs92iCXoJFhp0jowA7S5CoXkxsQI1vu0DmAfYEPekLxMG+TGxPhMO1OlnQPcibHs
ZW92BnkdMBYaB54GHyL9T3x6B74G3N3vAdhLourWJJaxgGHE38AbHeM78AgrNev2UaeDuVaS+wFvKKyR
ZXAnfwsM00a86nZAZgHG/r7P/wDvjVYBDpdJ4A6AU5q8DRgX+bJkKxoZ3mzLqcgB3lLIQwl5EjBc9v3x
LfBgj/kWk9wIPtLynneZ0cyPOuBilzMmLzVHwG3aWZm4oLxs6vKt+RuNqAN8hT49NXwLU7SjquLG+oHW
J4eQNoTpsSGEySJvgM/BtkGyHdh+XtQ+CiQTwDT9onIr1yng23mYiQVzIJXcXPLnAT79MZpB8cnipCZf
gOs0CUdK+RX04ostC8l64O3dxIQ6HFho+sAbtRKOb3878RO4z3zHUZMHIisXn/m29jOhDgeeN33gCYbi
WVq+0nxOUH5+C1ocK92q5Nv6gwl1OLDuYh/ZK5oYiH3LiYvlZI1mBJJRpgz2k3oc4LHU94HdtJ84D17S
fG5y/i3Q2XAIcXL7tn5hQh0OII7J+0BcE8Y0bo5wktMWRsE8O/MKnuV5bjDi7V3e1i4m1OHAtcBfrdPQ
qZqhklcBn/pyTYDczs3VKbidkE+AtxebW1oHhmKMw9ieFsgO0w9CZyu5AozXLwWiM7m9fBB3MjGRA251
sHf/RfBpL9KKVTUSdQ6YNrYgjUMxmQPthh6Ms+Zr5RJx4+tzx8ozxO0+M9UQ4vL2Jfi9gN8AVo68P76J
d0AsqMOQdBGsXV5Zx07spHOAYmgcg8slxjoDsbxPwhWHoQQnM2/pXgDvgZ+BLcdxvxrtWCV3oILckLCr
SRUYGz2hDVh1wwEnvg0ulXzy1oYQHnp4Foj9yt81B4zkVrAYo+yYsYVRJ4+Y4Rk4VJ/fbnEeDX/Yro0R
4Htjy3Q1sEzhnxpcEjAeul4NLJP9Y49LBpwE25L7cxteHnXTEa7vx8FacKUaVqJG4wJccl5y/LtKDwAA
AABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABIJJREFUaEPt
WkmoHUUUPae+mijEATFxJhpiiCiKC92pUVBQE4izcdgpokFQCWgcwI0RxU0iiEjEAV1EXEhcuDCOQRTU
RAXBkShGRBEVjTHGidPV/f/t26/69/fV65eFBw7//a6qe+/pmm7Ve0ABXgjwfYB/AuEfgC1UeVcWbX4H
+C7A2wEeHP1lBZfHwG1wPuihBFh+C/A8H8GQ4HvNABuOcwnQ851AWO6jGALq4klnxwET+wGhhSrvStXn
m00R/CMO2ywIu81bO8CXDg9uNoFrPtjPl/ja/wHcbYyOWsD1AL9wIi71LWaIXgWcA3A+wM/MM/m/zLea
AfoWUDzzInYBXOFbdsQ4BBTP5wPh0wwixiVACEcD/NiUaz+6vF5nWoxTQIGjnIgdABf7Si1ICggAbwTC
w93IBwAeYdqX4EZj//Vmu6KtrSM+7a20ILUPcFlzZ52OfM5aLu1c7YLrwl8B7u8tJZAUsATgX80g28jH
rOUSEwAfirYagbbxVG8ogZQAEOC5AG8BeGsHXgtgjmlvIVunAFw5oJ1h+NIIWOKNJJAUMAaEt/4X4Ev7
RVYB1LhV7nLziHgdALfS5BVw5sxXIc/GyuLp1vu8ApZFQ1UgPrgubATs+YKNJLOAYideCYRHRkM+CFC5
0KEAbwC4AQi/GAHvlLv76QAnTFweSQEjBucBVBrx24Ce8dwKcGncTxpI5kIjBM8ubyh8oG3UTr4e4Gxv
rGcBvKjM/Suff5f3RqvK4bII4EnxlMbHy7zICnkJwL7WYIsA3VLw/Iy8pkyXK3/qBR3sQ92vBY8E+KwT
8aQZTikBRe6y0zXMyc8BHjvlrxVaUNaYtuq16kYjKUBd6J3monrh+ClfnaCN9Rlj4xMA+7QIwGyAawFu
AvjykHzF+bnb+EmACwGe5p5p5frR2LmgTUBGFHOpOg/o7R9iC+NJja8BPKx8tBjg9/HeCLauytaZeB/t
S8CVxscmV6bxXd1ObAN4lvl/YzwQ1eorP6tsfdCXgNXGxzpfGs/SfLss1wTV3y2Dj5XFqlTZ+rkvAfdM
+Qj3+dII+eZ2E8sdvkYEDzJ1dvUlQMfSysd6X6oKAO+dCmqyFyTWDyFN7srWd30JWGp8bI0B18o1RzTJ
FYuyYJ2ddQWv+jo32LorjK3NfQmYa67WFegJrvz+8q3fZJ5p59bq5G4n+LyJd01uAbOAMBeYGEC+avxs
qDfjXgAX1J8NgsRMxqsXcXJGAcXqYO/+26i3fZW3MA0OBPihsfFiORSzCZhp6qE86wpvZTC08dXuWHWG
OLEqzCQAWt7eAPhTC3+IK8ekP/XEEy1J3awyg7XLq9rYiZ1NQAWlxilquVwQE7Fab2jFUSqhyaxbujsB
PgXwG1dP4/425y+7gA4ohoRdTbpQudHF3tKYBBRQb2ip1Ju3MXjq0KOzQOpb/rEJMOAx8Ro+fGViUdap
I6Y/A3vUvrtd1PxiuzfOAcJHJpYzfKQJ+J8a7BFUPnS4jzQB+2OPPYZrfZTToPi5jS6PxilE6/vXAO8C
uLePMIV/AVxyXnJs/RKjAAAAAElFTkSuQmCC
</value>
</data>
<data name="button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

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();
}

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);

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;

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();

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,5 @@
delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll BarcodeLibVBDatamatrix.dll, vboffice.dll
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll WinSign.dll BarcodeLibVBDatamatrix.dll, vboffice.dll
copy OnDocClient.zip H:\NextCloud\ZZDownload
pause

View File

@@ -1 +1 @@
jJyWJ21uO4ZPWjOWqbbJXT7Kmp3UhOVwaGGtsb1Ml6a4HVXLFVrYzvbtonLZkD225w3Mz09sdEJ5QXmXWBkMvgInFFg/KSV2tN9E0ucNo5Yo3vh4OKQe6zSBZkbL+R0qP3rYR0MCFimWHLhc9Y1rFVa/ZFNWA+ovuJ5hGRAJ3iGpN6rms7JsmwGSmFK5mW2fa7ovPAEPmvoj0VbSO3SBwaNN2X1AQju0MjxjzSrTy+8VzkAvV6VOsqkfDyc/9D5w89sKUEAqv90h5oQhkCUUWvS0lqBYqGtPv93ja+5ISrFmL6XOg2v1ChRJgSdSUGEEq5aG5h1ygiLqjZJ9BQqVdQ==
tVoCrmivT1eSy7/tTFYisxOKQG9LS8XLmOQE3Mft4GYEoxkBEMRDsNqpeV5XOp/KufMObq0BKXJj7ArBDO9n08mao8k0QGUkD5aWNGnsqsYfsVcQ67oQe2cvzwji0xRbNVzDhL8Ftec+Mf//Ky2SFgAxO79rXNcDtTIm5IkV3IINyWwjvBJMQALXBAFbi+lY6YtfNGSJse/Bafc2PK2OUHPBEFWz7cJ1aSktj5Abpg57lX0V0Ovrcxug1A6U0aAKacYwfvXGKuoJfHS3rmjRCnL4yKQCp6dO2M7HDFW5cixOIVYAvU1wb3lwZMSCQA2clQ4GAynL+qoJciO5iASrFQ==

Binary file not shown.

View File

@@ -1 +1 @@
044b9e5f627fc4e3dfab276a583f01f0a9a3b1c10a4b677364a16436a7b8d601
30020ba16c413af9ebdb848716997748f3fa6881266358574511befb160ae2db

View File

@@ -371,3 +371,5 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmSerienbrief.r
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\WinSign.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\WinSign.pdb

Binary file not shown.

Binary file not shown.