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

update 20240927

Browse Source
This commit is contained in:
Stefan Hutter
2024-09-27 18:41:27 +02:00
parent 9fcecb2c35
commit bbace0411f
172 changed files with 3073 additions and 1413076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Client/Diverses/valueselector.Designer.cs generated
View File

@@ -28,43 +28,45 @@
/// </summary>
private void InitializeComponent()
{
this.GridDokumenttyp = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.GridDokumenttyp)).BeginInit();
this.GridData = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.GridData)).BeginInit();
this.SuspendLayout();
//
// GridDokumenttyp
// GridData
//
this.GridDokumenttyp.AccessibleName = "Table";
this.GridDokumenttyp.AllowEditing = false;
this.GridDokumenttyp.AllowFiltering = true;
this.GridDokumenttyp.AllowResizingColumns = true;
this.GridDokumenttyp.AllowSelectionOnMouseDown = true;
this.GridDokumenttyp.Dock = System.Windows.Forms.DockStyle.Fill;
this.GridDokumenttyp.Location = new System.Drawing.Point(2, 2);
this.GridDokumenttyp.Name = "GridDokumenttyp";
this.GridDokumenttyp.Size = new System.Drawing.Size(796, 446);
this.GridDokumenttyp.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
this.GridDokumenttyp.TabIndex = 1;
this.GridDokumenttyp.Text = "sfDataGrid1";
this.GridData.AccessibleName = "Table";
this.GridData.AllowEditing = false;
this.GridData.AllowFiltering = true;
this.GridData.AllowResizingColumns = true;
this.GridData.AllowSelectionOnMouseDown = true;
this.GridData.Dock = System.Windows.Forms.DockStyle.Fill;
this.GridData.Location = new System.Drawing.Point(2, 2);
this.GridData.Name = "GridData";
this.GridData.Size = new System.Drawing.Size(369, 446);
this.GridData.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
this.GridData.TabIndex = 1;
this.GridData.Text = "sfDataGrid1";
this.GridData.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellClick);
this.GridData.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellDoubleClick);
//
// valueselector
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.GridDokumenttyp);
this.ClientSize = new System.Drawing.Size(373, 450);
this.Controls.Add(this.GridData);
this.Name = "valueselector";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Werte-Auwahl";
this.Load += new System.EventHandler(this.valueselector_Load);
((System.ComponentModel.ISupportInitialize)(this.GridDokumenttyp)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.GridData)).EndInit();
this.ResumeLayout(false);
}
#endregion
private Syncfusion.WinForms.DataGrid.SfDataGrid GridDokumenttyp;
private Syncfusion.WinForms.DataGrid.SfDataGrid GridData;
}
}

43
Client/Diverses/valueselector.cs
View File

@@ -7,7 +7,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using OnDoc.Klassen;
using Syncfusion.WinForms.Controls;
using Windows.UI.Xaml.Controls;
namespace OnDoc.Diverses
{
@@ -15,6 +17,8 @@ namespace OnDoc.Diverses
{
public string partnernr { get; set; } = "";
public string datenherkunft { get; set; } = "";
public string selected_value { get; set; }
public valueselector()
{
InitializeComponent();
@@ -22,11 +26,46 @@ namespace OnDoc.Diverses
private void valueselector_Load(object sender, EventArgs e)
{
this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y);
}
public void load_data() {
public void load_data()
{
Database.DB dB = new Database.DB(AppParams.connectionstring);
dB.clear_parameter();
dB.add_parameter("@nrpar00",partnernr);
dB.add_parameter("@regel", datenherkunft);
dB.Get_Tabledata("dbo.SP_Dokumentbearbeitung_DokWertList", true, false);
this.GridData.DataSource = dB.dsdaten.Tables[0];
GridData.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
private void GridData_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
string value = "";
try
{
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
value = dataRow[0].ToString();
selected_value = value;
}
catch { selected_value = ""; }
}
private void GridData_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
string value = "";
try
{
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
value = dataRow[0].ToString();
selected_value = value;
}
catch { selected_value = ""; }
DialogResult = DialogResult.OK;
this.Close();
}
}
}

28
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -27,6 +27,8 @@ namespace OnDoc.DocMgmt
public string showdoc { get; set; } = "";
public int DocFunction = 0;
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
public string dokumentid = "";
public Dokumenterstellung()
@@ -68,7 +70,10 @@ namespace OnDoc.DocMgmt
Dokument_Erstellen();
}
public void Dokument_Erstellen()
{
{
if (ucAllgemeineDokumentParam1.check_fields()==false) {
MessageBox.Show(ucAllgemeineDokumentParam1.check_error);
return; };
ucAllgemeineDokumentParam1.Update_DocGenData();
clsDocData dokdata = new clsDocData();
ucAllgemeineDokumentParam1.update_dokdata(ref dokdata);
@@ -83,6 +88,8 @@ namespace OnDoc.DocMgmt
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
interop = ucAllgemeineDokumentParam1.interop;
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
@@ -90,10 +97,21 @@ namespace OnDoc.DocMgmt
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
DocFunction = 1;
System.Diagnostics.Process.Start("winword.exe", filename);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
//if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
//if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
//clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
this.Close();
return;
}
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentPreview)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
}
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF)
{
@@ -135,7 +153,7 @@ namespace OnDoc.DocMgmt
button5.Enabled = true;
}
if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == false) { button5.Enabled = false; }
docPreview1.Show_Doc(dokumentid);
docPreview1.Show_Doc(dokumentid);
docPreview1.Hide_Editbuttons();
}
}

1
Client/DocMgmt/FrmDokumenterstellung.cs
View File

@@ -19,6 +19,7 @@ using System.Threading.Tasks;
using System.Web.UI.WebControls;
using System.Windows.Forms;
using Database;
using OnDoc.UIControls;
namespace OnDoc.DocMgmt
{

2
Client/DocMgmt/Vorlagenauswahl.cs
View File

@@ -46,7 +46,7 @@ namespace OnDoc.UICintrols
where = "and bezeichnung like '%" + filter.Replace(" ", "%") + "%'";
}
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung from dokumenttyp where aktiv=1 "+where+" order by bezeichnung",false,true);
db.Get_Tabledata("Select distinct dokumenttypnr as id, bezeichnung from dokumenttyp where aktiv=1 "+where+" order by bezeichnung",false,true);
sfListView1.DataSource = db.dsdaten.Tables[0];
sfListView1.DisplayMember = "bezeichnung";
sfListView1.ValueMember = "id";

116
Client/UIControls/Administrator/Dokumenttyp.Designer.cs generated
View File

@@ -58,6 +58,7 @@
this.GrpBewilligung = new System.Windows.Forms.GroupBox();
this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox();
this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox();
this.cbPDFDirekteArchivierung = new System.Windows.Forms.CheckBox();
this.cbPDFDokument = new System.Windows.Forms.CheckBox();
@@ -129,13 +130,14 @@
this.lblID = new System.Windows.Forms.Label();
this.lbliddesc = new System.Windows.Forms.Label();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.TreeDokumenttyp = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.panel1 = new System.Windows.Forms.Panel();
this.txtFilter = new System.Windows.Forms.TextBox();
this.rbBezeichnung = new System.Windows.Forms.RadioButton();
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.TreeDokumenttyp = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.chkinterop = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -162,8 +164,8 @@
this.toolStrip1.SuspendLayout();
this.grpVorlagenfeld.SuspendLayout();
this.groupBox7.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// tabControlAdv1
@@ -351,6 +353,8 @@
//
// groupBox4
//
this.groupBox4.Controls.Add(this.chkinterop);
this.groupBox4.Controls.Add(this.chkbearbeitungdirekt);
this.groupBox4.Controls.Add(this.cbbearbeitungzwingend);
this.groupBox4.Controls.Add(this.cbPDFDirekteArchivierung);
this.groupBox4.Controls.Add(this.cbPDFDokument);
@@ -362,6 +366,14 @@
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// chkbearbeitungdirekt
//
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(259, 40);
this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt";
this.chkbearbeitungdirekt.Size = new System.Drawing.Size(127, 24);
this.chkbearbeitungdirekt.TabIndex = 10;
this.chkbearbeitungdirekt.Text = "Direkt bearbeiten";
//
// cbbearbeitungzwingend
//
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(259, 19);
@@ -1229,6 +1241,52 @@
this.groupBox7.TabStop = false;
this.groupBox7.Text = "sflk";
//
// TreeDokumenttyp
//
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.ShowCheckBox = false;
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.TreeDokumenttyp.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.Dock = System.Windows.Forms.DockStyle.Left;
//
//
//
this.TreeDokumenttyp.HelpTextControl.BaseThemeName = null;
this.TreeDokumenttyp.HelpTextControl.Location = new System.Drawing.Point(0, 0);
this.TreeDokumenttyp.HelpTextControl.Name = "";
this.TreeDokumenttyp.HelpTextControl.Size = new System.Drawing.Size(392, 112);
this.TreeDokumenttyp.HelpTextControl.TabIndex = 0;
this.TreeDokumenttyp.HelpTextControl.Visible = true;
this.TreeDokumenttyp.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.TreeDokumenttyp.Location = new System.Drawing.Point(3, 87);
this.TreeDokumenttyp.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.TreeDokumenttyp.Name = "TreeDokumenttyp";
this.TreeDokumenttyp.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.TreeDokumenttyp.Size = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.SortWithChildNodes = true;
this.TreeDokumenttyp.TabIndex = 11;
this.TreeDokumenttyp.Text = "treeViewAdv1";
this.TreeDokumenttyp.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
this.TreeDokumenttyp.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
//
//
//
this.TreeDokumenttyp.ToolTipControl.BaseThemeName = null;
this.TreeDokumenttyp.ToolTipControl.Location = new System.Drawing.Point(0, 0);
this.TreeDokumenttyp.ToolTipControl.Name = "";
this.TreeDokumenttyp.ToolTipControl.Size = new System.Drawing.Size(392, 112);
this.TreeDokumenttyp.ToolTipControl.TabIndex = 0;
this.TreeDokumenttyp.ToolTipControl.Visible = true;
this.TreeDokumenttyp.AfterSelect += new System.EventHandler(this.TreeDokumenttyp_AfterSelect);
this.TreeDokumenttyp.Click += new System.EventHandler(this.TreeDokumenttyp_Click);
//
// panel1
//
this.panel1.Controls.Add(this.txtFilter);
@@ -1292,51 +1350,13 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// TreeDokumenttyp
// chkinterop
//
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.ShowCheckBox = false;
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.TreeDokumenttyp.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.Dock = System.Windows.Forms.DockStyle.Left;
//
//
//
this.TreeDokumenttyp.HelpTextControl.BaseThemeName = null;
this.TreeDokumenttyp.HelpTextControl.Location = new System.Drawing.Point(0, 0);
this.TreeDokumenttyp.HelpTextControl.Name = "";
this.TreeDokumenttyp.HelpTextControl.Size = new System.Drawing.Size(392, 112);
this.TreeDokumenttyp.HelpTextControl.TabIndex = 0;
this.TreeDokumenttyp.HelpTextControl.Visible = true;
this.TreeDokumenttyp.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.TreeDokumenttyp.Location = new System.Drawing.Point(3, 87);
this.TreeDokumenttyp.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.TreeDokumenttyp.Name = "TreeDokumenttyp";
this.TreeDokumenttyp.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.TreeDokumenttyp.Size = new System.Drawing.Size(303, 670);
this.TreeDokumenttyp.SortWithChildNodes = true;
this.TreeDokumenttyp.TabIndex = 11;
this.TreeDokumenttyp.Text = "treeViewAdv1";
this.TreeDokumenttyp.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
this.TreeDokumenttyp.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
//
//
//
this.TreeDokumenttyp.ToolTipControl.BaseThemeName = null;
this.TreeDokumenttyp.ToolTipControl.Location = new System.Drawing.Point(0, 0);
this.TreeDokumenttyp.ToolTipControl.Name = "";
this.TreeDokumenttyp.ToolTipControl.Size = new System.Drawing.Size(392, 112);
this.TreeDokumenttyp.ToolTipControl.TabIndex = 0;
this.TreeDokumenttyp.ToolTipControl.Visible = true;
this.TreeDokumenttyp.AfterSelect += new System.EventHandler(this.TreeDokumenttyp_AfterSelect);
this.TreeDokumenttyp.Click += new System.EventHandler(this.TreeDokumenttyp_Click);
this.chkinterop.Location = new System.Drawing.Point(259, 59);
this.chkinterop.Name = "chkinterop";
this.chkinterop.Size = new System.Drawing.Size(127, 24);
this.chkinterop.TabIndex = 11;
this.chkinterop.Text = "Bearbeitung InterOP";
//
// Dokumenttyp
//
@@ -1385,9 +1405,9 @@
this.grpVorlagenfeld.ResumeLayout(false);
this.grpVorlagenfeld.PerformLayout();
this.groupBox7.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.ResumeLayout(false);
}
@@ -1490,5 +1510,7 @@
private System.Windows.Forms.RadioButton rbNr;
private System.Windows.Forms.Label label15;
private Syncfusion.Windows.Forms.Tools.TreeViewAdv TreeDokumenttyp;
internal System.Windows.Forms.CheckBox chkbearbeitungdirekt;
internal System.Windows.Forms.CheckBox chkinterop;
}
}

15
Client/UIControls/Administrator/Dokumenttyp.cs
View File

@@ -42,6 +42,7 @@ namespace OnDoc.UIControls.Administrator
System.Data.DataTable treedata = new System.Data.DataTable();
private void update_tree()
{
TreeDokumenttyp.Nodes.Clear();
db.Get_Tabledata("Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp", false, true);
treedata = db.dsdaten.Tables[0].Copy();
string _sqlWhere = " Bezeichnung like '%" + txtFilter.Text + "%'";
@@ -145,6 +146,17 @@ namespace OnDoc.UIControls.Administrator
this.listBox1.DataSource = db.dsdaten.Tables[0];
this.listBox1.DisplayMember = "Bezeichnung";
this.listBox1.ValueMember = "vorlagenfeldregelnr";
try
{
chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
}
catch { chkbearbeitungdirekt.Checked = false; }
try
{
chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
}
catch { chkinterop.Checked = false; }
Update_Vorlagenfelder();
@@ -285,7 +297,8 @@ namespace OnDoc.UIControls.Administrator
r["mutiert_am"]=DateTime.Now;
r["versandstrasse_moeglich"] = cbversandstrasse_moeglich.Checked == true;
r["ebanking_moeglich"] = cbebanking_moeglich.Checked == true;
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked==true;
r["interop"] = chkinterop.Checked == true;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }

13
Client/UIControls/DokList.cs
View File

@@ -1,6 +1,5 @@
using OnDoc.Helper;
using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Tools;
using System;
using System.Collections.Generic;
@@ -61,6 +60,9 @@ namespace OnDoc.UICintrols
private bool Separate_Vorschau_offen = false;
public string datafilter { get; set; } = "";
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
public DokList()
{
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE");
@@ -230,7 +232,7 @@ namespace OnDoc.UICintrols
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
OpenDoc(dok, true);
OpenDoc(dok, true,interop, runmacros);
}
private clsdok GetDoc(bool AsPDF)
@@ -288,7 +290,7 @@ namespace OnDoc.UICintrols
return dok;
}
private void OpenDoc(clsdok dok, bool editdoc, bool interop = false)
private void OpenDoc(clsdok dok, bool editdoc, bool interop = false, bool runmacros = false)
{
switch (dok.extension.ToUpper().Substring(0, 1))
@@ -301,7 +303,7 @@ namespace OnDoc.UICintrols
if (interop == true)
{
OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid);
WordInterOP.Edit_Document();
WordInterOP.Edit_Document(runmacros);
WordInterOP = null;
}
else
@@ -489,6 +491,9 @@ namespace OnDoc.UICintrols
if (frmnewdok.dokumentid != "")
{
selected_dokumentid = frmnewdok.dokumentid;
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
dokument_bearbeiten();
}
break;

48
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -25,6 +25,11 @@ namespace OnDoc.UIControls
public int profilnr { get; set; }
public int partnernr { get; set; }
public bool checkpartner { get; set; } = true;
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
public string check_error { get; set; } = "";
public clsdocgendata docgendata { get; set; }
@@ -94,7 +99,15 @@ namespace OnDoc.UIControls
}
if (Convert.ToInt32(dr["Unterschrift_Standard"].ToString()) == 1) { cbfaksimile.Checked = true; }
if (Convert.ToInt32(dr["Unterschrift_Standard"].ToString()) == 2) { cbformularohneunterschrfit.Checked = true; }
try
{
this.rbDokumentbearbeiten.Checked = Convert.ToBoolean(dr["BearbeitungDirket"]) == true;
} catch { this.rbDokumentbearbeiten.Checked = false; }
try
{
interop = Convert.ToBoolean(dr["interop"]) == true;
}
catch { interop = false; }
}
else
{
@@ -227,6 +240,25 @@ namespace OnDoc.UIControls
{
this.rbEditlater.Checked = true;
}
public Boolean check_fields()
{
check_error = "";
var records = gridDokwertlist.View.Records;
foreach (var record in records)
{
var dataRowView = record.Data as DataRowView;
if (dataRowView != null)
{
bool zwingend = Convert.ToBoolean(dataRowView.Row["zwingend"]);
var feldwert = dataRowView.Row["feldwert"].ToString().Trim();
var bezeichnung = dataRowView.Row["bezeichnung"];
if (zwingend==true && feldwert=="")
{ check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend" + "//"; }
}
}
if (check_error == "") { return true; } else { return false; }
return true;
}
public void Update_DocGenData()
{
docgendata.partnernr = this.partnernr.ToString();
@@ -252,12 +284,13 @@ namespace OnDoc.UIControls
docgendata.ersteller = AppParams.CurrentMitarbieter.ToString();
docgendata.dokumentdatum = DateDokumentDatum.DateTimeText.ToString();
docgendata.bezeichnung = txtbezeichnung.Text;
docgendata.erstellungsart = Erstellungsart.DokumentPreview;
if (rbDokumentbearbeiten.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; }
if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
//XXXXXdocgendata.dokumentwerte = gridDokwertlist.DataSource;
docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
}
public void update_dokdata(ref clsDocData dokdata)
@@ -277,7 +310,8 @@ namespace OnDoc.UIControls
dokdata.Bezeichnung = docgendata.bezeichnung;
if (docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = "False"; }
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
dokdata.dokumentwerte = docgendata.dokumentwerte;
}
private void sfButton1_Click(object sender, EventArgs e)
{
@@ -396,8 +430,16 @@ namespace OnDoc.UIControls
}
}
vs.partnernr = s.Substring(0, s.IndexOf("-") - 1);
vs.load_data();
vs.ShowDialog();
}
vs.datenherkunft = datenherkunft;
vs.partnernr = this.partnernr.ToString();
vs.load_data();
vs.ShowDialog();
if (vs.DialogResult == DialogResult.OK) {
return vs.selected_value;
}
break;
default:

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/ExcelNet.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/ExcelNet.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Model.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Model.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

2710
Client/bin/Debug/log.txt
View File

File diff suppressed because it is too large Load Diff

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.