Update 20250117 12:30

This commit is contained in:
Stefan Hutter
2025-01-17 12:37:03 +01:00
parent 3e36dd541b
commit cfd7c00451
147 changed files with 89099 additions and 248 deletions

View File

@@ -57,24 +57,28 @@ namespace OnDoc.UIControls
}
public void Show_Doc(string dokumentid)
{
PrintDokID= dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
//clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
if (stream.Length > 0)
try
{
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
}
else
{
PrintDokID = dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
//clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
if (stream.Length > 0)
{
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
}
else
{
}
}
catch { }
}
public void show_base64(string image,string Logtext)

View File

@@ -979,6 +979,24 @@ namespace OnDoc.UICintrols
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
}
if (e.Column.MappingName == "Erstellt am")
{
var f = e.Column.Format;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
e.DisplayText = dataRow["Erstellt am"].ToString();
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "Mutiert am")
{
var f = e.Column.Format;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
e.DisplayText = dataRow["Mutiert am"].ToString();
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "fileext")
{
try

View File

@@ -58,6 +58,7 @@
this.GrpTeam = new System.Windows.Forms.GroupBox();
this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox();
this.GrpUnterschrift = new System.Windows.Forms.GroupBox();
this.lblohneUnterschrift = new System.Windows.Forms.Label();
this.cbformularohneunterschrfit = new System.Windows.Forms.CheckBox();
this.cbfaksimile = new System.Windows.Forms.CheckBox();
this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -79,7 +80,6 @@
this.lblPostzustellung = new System.Windows.Forms.Label();
this.btnErneutGenerierung = new System.Windows.Forms.Button();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.lblohneUnterschrift = new System.Windows.Forms.Label();
this.GrpPartner.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
@@ -307,9 +307,10 @@
this.gridDokwertlist.Size = new System.Drawing.Size(456, 376);
this.gridDokwertlist.TabIndex = 0;
this.gridDokwertlist.Text = "sfDataGrid1";
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick);
this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
this.gridDokwertlist.CurrentCellEndEdit += new Syncfusion.WinForms.DataGrid.Events.CurrentCellEndEditEventHandler(this.gridDokwertlist_CurrentCellEndEdit);
this.gridDokwertlist.DoubleClick += new System.EventHandler(this.gridDokwertlist_DoubleClick);
//
// lblBezeichnung
//
@@ -424,6 +425,16 @@
this.GrpUnterschrift.TabStop = false;
this.GrpUnterschrift.Text = "Unterschriften";
//
// lblohneUnterschrift
//
this.lblohneUnterschrift.AutoSize = true;
this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
this.lblohneUnterschrift.Name = "lblohneUnterschrift";
this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
this.lblohneUnterschrift.TabIndex = 12;
this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
this.lblohneUnterschrift.Visible = false;
//
// cbformularohneunterschrfit
//
this.cbformularohneunterschrfit.AutoSize = true;
@@ -648,16 +659,6 @@
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// lblohneUnterschrift
//
this.lblohneUnterschrift.AutoSize = true;
this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
this.lblohneUnterschrift.Name = "lblohneUnterschrift";
this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
this.lblohneUnterschrift.TabIndex = 12;
this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
this.lblohneUnterschrift.Visible = false;
//
// UCAllgemeineDokumentParam
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View File

@@ -37,6 +37,8 @@ namespace OnDoc.UIControls
public bool interop { get; set; } = false;
public bool barcode { get; set; } = false;
public bool bedingt_retournierbar { get; set; } = false;
public bool runmacros { get; set; } = false;
public string check_error { get; set; } = "";
@@ -175,8 +177,15 @@ namespace OnDoc.UIControls
catch { interop = false; }
barcode = Convert.ToBoolean(dr["Vertrag"])== true;
barcode = Convert.ToBoolean(dr["zu_retournieren"]) == true;
if (Convert.ToInt32(dr["doktypbedingteretournierung"]) > 0)
{
barcode = true;
}
try
{
this.bedingt_retournierbar = Convert.ToBoolean(dr["bedingtretournierbar"]) == true;
}
catch { }
try
{
if (dr["physisches_archiv"].ToString() == "1") { this.barcode_zusatz = " U"; }
@@ -571,6 +580,7 @@ namespace OnDoc.UIControls
try { docgendata.unterschriftRehts = cbboxunterschriftrechts.SelectedValue.ToString(); } catch { docgendata.unterschriftRehts = ""; }
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; }
docgendata.verantwortlich = cbboxverantwortlich.SelectedValue.ToString();
docgendata.team = cbboxteam.SelectedValue.ToString();
@@ -644,6 +654,7 @@ namespace OnDoc.UIControls
dokdata.Erstellung_in_Office = this.Erstellung_in_Office;
dokdata.FillOffice = this.FillOffice;
dokdata.CompatibilityMode= this.CompatibilityMode;
if (dokdata.Barcode==false && this.bedingt_retournierbar==true) { dokdata.Barcode = true; }
if (DateTerminText.Text == "")
{
@@ -685,18 +696,22 @@ namespace OnDoc.UIControls
private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
if (e.DataColumn.ColumnIndex!=15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
try
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
//if (e.DataColumn.ColumnIndex != 15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
}
}
catch { }
}
private string data_select(string datenherkunft, string feldtyp)
@@ -890,5 +905,31 @@ namespace OnDoc.UIControls
{
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
}
private void gridDokwertlist_DoubleClick(object sender, EventArgs e)
{
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
try
{
if (e.DataColumn.ColumnIndex != 15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
}
}
catch { }
}
}
}