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

updaet 20250226

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-26 07:54:12 +01:00
parent 0f76b2b376
commit d745bb8ead
47 changed files with 205 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Client/UIControls/Approval.Designer.cs generated
View File

@@ -65,6 +65,8 @@
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.panelsign = new System.Windows.Forms.Panel();
this.label5 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -72,6 +74,7 @@
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.grpDetails.SuspendLayout();
this.panelsign.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -86,6 +89,7 @@
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.panelsign);
this.splitContainer1.Panel2.Controls.Add(this.panel1);
this.splitContainer1.Panel2.Controls.Add(this.grpDetails);
this.splitContainer1.Panel2.Controls.Add(this.docPreview1);
@@ -492,6 +496,26 @@
this.ribbonButton1.Text = "Aktualisieren";
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// panelsign
//
this.panelsign.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panelsign.Controls.Add(this.label5);
this.panelsign.Location = new System.Drawing.Point(117, 47);
this.panelsign.Name = "panelsign";
this.panelsign.Size = new System.Drawing.Size(804, 167);
this.panelsign.TabIndex = 5;
this.panelsign.Visible = false;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(188, 81);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(390, 24);
this.label5.TabIndex = 0;
this.label5.Text = "Das Dokument wird signiert - bitte warten";
//
// Approval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -507,6 +531,8 @@
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit();
this.grpDetails.ResumeLayout(false);
this.grpDetails.PerformLayout();
this.panelsign.ResumeLayout(false);
this.panelsign.PerformLayout();
this.ResumeLayout(false);
}
@@ -544,5 +570,7 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.RibbonPanel ribbonPanel2;
private System.Windows.Forms.RibbonButton ribbonButton1;
private System.Windows.Forms.Panel panelsign;
private System.Windows.Forms.Label label5;
}
}

5
Client/UIControls/Approval.cs
View File

@@ -202,6 +202,7 @@ namespace OnDoc.UIControls
}
else
{
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
@@ -212,6 +213,8 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select * from dokument where dokumentid='" + dr["dokumentid"].ToString() + "'", false, true);
if (db.dsdaten.Tables[0].Rows[0]["approved"].ToString()=="True")
{
panelsign.Visible = true;
Application.DoEvents();
Cursor = Cursors.WaitCursor;
DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey);
if (dg.signdoc(dr["dokumentid"].ToString(), AppParams.tempdir))
@@ -219,6 +222,8 @@ namespace OnDoc.UIControls
db.Exec_SQL("Update Dokument set signiert=1, mutierer=" + AppParams.CurrentMitarbeiter.ToString() + ", mutiertam=getdate() where dokumentid='" + dr["dokumentid"].ToString() + "'");
}
dg = null;
panelsign.Visible = false;
Application.DoEvents();
Cursor = Cursors.Default;
}

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

@@ -814,7 +814,7 @@ namespace OnDoc.UICintrols
this.ribbonButton3.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.ribbonButton3.Name = "ribbonButton3";
this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Partner_16x16_32;
this.ribbonButton3.Text = "Partner";
this.ribbonButton3.Text = "Kunde";
this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1);
//
// RibbonGroupFilter

11
Client/UIControls/DokList.cs
View File

@@ -1417,7 +1417,14 @@ namespace OnDoc.UICintrols
{
StreamReader reader = new StreamReader(response.GetResponseStream());
string responseContent = reader.ReadToEnd();
Logging.DocLog.Info("Dokument archiviert", "OnDoc", documentid, "", "Dokument archiviert und abgeschlossen");
if (responseContent.Contains("Hinweismeldung:"))
{
MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent);
return;
}
Logging.DocLog.Info("Dokument archiviert", "OnDoc", documentid, "", "Dokument archiviert und abgeschlossen");
}
else
{
@@ -1437,7 +1444,7 @@ namespace OnDoc.UICintrols
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) archiviern und abschliessen", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
if (MessageBox.Show("Gewählte Dokument(e) archivieren und abschliessen?", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
DB db = new DB(AppParams.connectionstring);
Cursor = Cursors.WaitCursor;

1
Client/UIControls/Partnersuche.cs
View File

@@ -84,6 +84,7 @@ namespace OnDoc.UIControls
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
trefferlistedata.Columns[0].HeaderText = "Kunden-Nr.";
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;