Update 20250618

Client/Diverses/FrmExternalDocEdit.Designer.cs

@@ -117,7 +117,7 @@
             // 
             this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
             this.sfButton1.Location = new System.Drawing.Point(6, 110);
-            this.sfButton1.Name = "sfButton1";
+            this.sfButton1.Name = "sn3fButton1";
             this.sfButton1.Size = new System.Drawing.Size(162, 28);
             this.sfButton1.TabIndex = 7;
             this.sfButton1.Text = "Neues Dokument erstellen";

Client/Diverses/MitarbeiterProfil.cs

@@ -73,6 +73,16 @@ namespace OnDoc.Diverses
             {
                 btnSaveForUser.Visible = true;
             }
+            if (AppParams.SignaturePassword.ToString() != "")
+            {
+                button1.Visible = false;
+                button3.Visible = true;
+            }
+            else
+            {
+                button1.Visible = true;
+                button3.Visible = false;
+            }
             load_adressen();
 
         }
@@ -468,7 +478,12 @@ namespace OnDoc.Diverses
 
         private void button2_Click(object sender, EventArgs e)
         {
-            GrpGetSignature.Visible = true;
+            if (AppParams.SignApp != "")
+            {
+                System.Diagnostics.Process.Start(AppParams.SignApp);
+            }
+            else
+            { GrpGetSignature.Visible = true; }
         }
 
         private void label15_Click(object sender, EventArgs e)
@@ -851,6 +866,19 @@ namespace OnDoc.Diverses
             GrpBoxMitarbeiter.Visible = false;
             GrpGAS.Visible = true;
         }
+
+        private void button3_Click_1(object sender, EventArgs e)
+        {
+            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();
+
+        }
     }
 }
 

Client/Diverses/SplashScreen.Designer.cs

@@ -40,9 +40,10 @@
             this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage")));
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
             this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage")));
-            this.pictureBox1.Location = new System.Drawing.Point(104, 25);
+            this.pictureBox1.Location = new System.Drawing.Point(139, 31);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(261, 258);
+            this.pictureBox1.Size = new System.Drawing.Size(348, 318);
             this.pictureBox1.TabIndex = 0;
             this.pictureBox1.TabStop = false;
             // 
@@ -50,9 +51,10 @@
             // 
             this.label1.AutoSize = true;
             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.Location = new System.Drawing.Point(219, 374);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(122, 26);
+            this.label1.Size = new System.Drawing.Size(151, 31);
             this.label1.TabIndex = 1;
             this.label1.Text = "Version 1.6";
             // 
@@ -60,23 +62,25 @@
             // 
             this.label2.AutoSize = true;
             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(159, 330);
+            this.label2.Location = new System.Drawing.Point(207, 406);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(130, 26);
+            this.label2.Size = new System.Drawing.Size(176, 31);
             this.label2.TabIndex = 2;
-            this.label2.Text = "5. Juni 2025";
+            this.label2.Text = "17. Juni 2025";
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 
             // SplashScreen
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(469, 396);
+            this.ClientSize = new System.Drawing.Size(625, 487);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "SplashScreen";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "SplashScreen";

Client/Klassen/clsAppParams.cs

@@ -67,6 +67,8 @@ namespace OnDoc.Klassen
         public static bool versandstrassewindows_open { get; set; } = false;
 
         public static bool AutomArchivierung { get; set; } = false;
+
+        public static string SignApp { get; set; } = "";
         static AppParams()
         {
 
@@ -105,6 +107,7 @@ namespace OnDoc.Klassen
                 SignaturePassword = db.dsdaten.Tables[0].Rows[0][20].ToString();
                 Environment = db.dsdaten.Tables[0].Rows[0][21].ToString();
                 AutomArchivierung = db.dsdaten.Tables[0].Rows[0][22].ToString() == "TRUE";
+                SignApp = db.dsdaten.Tables[0].Rows[0][23].ToString();
             }
             else
             {

Client/Start.cs

@@ -144,6 +144,7 @@ namespace OnDoc
 
             dokList1.mitarbeiternr = AppParams.CurrentMitarbeiter;
             
+            dokList1.load_Profile();
             dokList1.load_Profile();
             dokList1.refresh_dokumente();
             dokList1.set_functions();
@@ -325,7 +326,7 @@ namespace OnDoc
                                 case 3:
                                     Logging.DocLog.Info("Archiviertes Dokument wieder bearbeiten '" + ExternalCall.dokumentid ,"OnDoc",ExternalCall.dokumentid, "", "Dokument erneut bearbeiten");
                                     DB db1 = new DB(AppParams.connectionstring);
-                                    db1.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString());
+                                    db1.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString(),1);
                                     
                                     dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false);
                                     db1 = null;

Client/UIControls/DokList.cs

@@ -1594,7 +1594,7 @@ namespace OnDoc.UICintrols
         private void archivedoc(string documentid)
         {
             string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid;
-
+            
             HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
             webRequest.Method = WebRequestMethods.Http.Get;
             webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
@@ -1608,6 +1608,15 @@ namespace OnDoc.UICintrols
                         string responseContent = reader.ReadToEnd();
                         if (responseContent.Contains("Hinweismeldung:"))
                         {
+                            DB db = new DB(AppParams.connectionstring);
+                            if (db.dokument_in_wiederbearbeitung(documentid))
+                            {
+                                MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent+Environment.NewLine+Environment.NewLine+"Stelle im OnBase sicher, dass du das wiederbearbeitete Dokument nicht anzeigst und dadurch die Bearbeitung/Archivierung blockierst.");
+                                db = null;
+                                return;
+                            }
+                            db = null;
+
                             MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent);
                             return;
                         }
@@ -1624,6 +1633,14 @@ namespace OnDoc.UICintrols
             }
             catch (Exception ex)
             {
+                DB db = new DB(AppParams.connectionstring);
+                if (db.dokument_in_wiederbearbeitung(documentid))
+                {
+                    MessageBox.Show("Die Archivierung des Dokumentes " + documentid + "  konnte nicht durchgeführt werden:" + Environment.NewLine + "Fehler: " + ex.Message + Environment.NewLine + Environment.NewLine + "Stelle im OnBase sicher, dass du das wiederbearbeitete Dokument nicht anzeigst und dadurch die Bearbeitung/Archivierung blockierst.");
+                    db = null;
+                    return;
+                }
+                db = null;
                 MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message);
             }
         }

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -783,6 +783,14 @@ namespace OnDoc.UIControls
                 dokdata.postzustellung = cbboxpostzustellung.SelectedValue.ToString();
             }
             catch { dokdata.postzustellung = "0"; }
+            try
+            {
+                if (cbboxpostzustellung.Text == "")
+                {
+                    dokdata.postzustellung = "0";
+                }
+            }
+            catch { }
 
 
             if (List_avqref.Count > 0) { dokdata.avq_authl_ref=List_avqref; }

Client/Versandstrasse/Versandstrasse.cs

@@ -364,7 +364,7 @@ namespace OnDoc.Versandstrasse
             foreach (TreeNodeAdv dokumentnode in node.Nodes)
             {
                 //node.LeftImageIndices = new int[] { 0 };
-                db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
+                db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc, isnull(postzustellung,0) as postzustellung FROM dbo.dokument INNER JOIN " +
                             " dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
                 //BP-Verifikation
                 //if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]))
@@ -383,6 +383,12 @@ namespace OnDoc.Versandstrasse
                 }
                 else
                 {
+                    if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1)
+                    {
+                        set_nodeimage(dokumentnode, 2);
+                        versandbereit = false;
+                        add_errormessage(2, "Im Versand-Couvert liegt an erster Position ein Dokument, bei welchem die Postzustellung festgelegt wurde.");
+                    }
                     if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
                     {
                         if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); }