Update 20250505

This commit is contained in:
Stefan Hutter
2025-05-05 17:50:51 +02:00
parent 5aa75038e7
commit 3e7d72e379
26 changed files with 78 additions and 24 deletions

View File

@@ -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.5";
//
@@ -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(161, 330);
this.label2.Location = new System.Drawing.Point(215, 406);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(125, 26);
this.label2.Size = new System.Drawing.Size(154, 31);
this.label2.TabIndex = 2;
this.label2.Text = "5. Mai 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";

View File

@@ -233,11 +233,12 @@ namespace OnDoc
EDK_Data.Load_EDK_File(filename);
dB.save_edk(filename, AppParams.CurrentMitarbeiter);
System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
{
exec_edk(filename);
}
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
private void URI_Call(string filename)
{
@@ -428,13 +429,13 @@ namespace OnDoc
{
if (edkb12_check(filename))
{
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
MessageBox.Show("Das gewählte Dokument wird im Hintergrund erstellt.", "Dokumenterstellung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
}
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
int doktyp = Convert.ToInt32(dokumenttypnr);
doktyp = doktyp - 900000000;
EDK_Data.toexecute = true;
@@ -452,8 +453,8 @@ namespace OnDoc
{
string partnernr = EDK_Data.AnzeigePartnernr;
dokList1.refresh_edk_partner(Convert.ToInt32(partnernr));
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
}
@@ -508,6 +509,18 @@ namespace OnDoc
e.Cancel = true;
}
}
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from OnDoc_Versandstrasse_Reserved_Documents where mitarbeiter=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
if (MessageBox.Show("Vor dem Schliessen müssen im Fesnter 'Versandstrasse' die offenen Versand-Couvertes bereinigt werden."+Environment.NewLine+"Trotzdem schliessen?", "OnDoc schliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question)==DialogResult.No)
{
e.Cancel = true;
}
}
db = null;
}
}
}

View File

@@ -2115,6 +2115,7 @@ namespace OnDoc.UICintrols
ribbonSaveGridView.Enabled = AppParams.isSysadmin;
ribbonSaveGridView.Visible = AppParams.isSysadmin;
ribbonAnmelden.Visible = AppParams.showlogin;
System.Windows.Forms.Application.DoEvents();
//pos_elements();
}

View File

@@ -736,6 +736,8 @@ namespace OnDoc.UIControls
if (cbboxunterschriftrechts.Text == "") { docgendata.unterschriftRehts = "-1"; }
}
catch { }
if (cbboxunterschriftlinks.Visible == false) { docgendata.unterschriftLinks = "-1"; }
if (cbboxunterschriftrechts.Visible ==false) { docgendata.unterschriftRehts = "-1"; }
if (cbfaksimile.Checked) { docgendata.digitaleunterschrift = true; } else { docgendata.digitaleunterschrift = false; }
if (cbformularohneunterschrfit.Checked) { docgendata.frormularOhneUnterschrift = true; } else { docgendata.frormularOhneUnterschrift = false; }
if (lblohneUnterschrift.Visible) { docgendata.frormularOhneUnterschrift = true; }

View File

@@ -390,8 +390,8 @@ namespace OnDoc.Versandstrasse
{
set_nodeimage(dokumentnode, 5);
}
db.Get_Tabledata("Select unterschriftlinks, unterschriftrechts, signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) != 0){
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 4);

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.