update 20250102

master
Stefan Hutter 11 months ago
parent 53a008972e
commit 3b0a2b0527

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
vbBarcodes
</name>
</assembly>
<members>
<member name="T:vbBarcodes.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

@ -296,3 +296,7 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.Optimization
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetF.7D617477.Up2Date E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetF.7D617477.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.dll E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.pdb E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\MW6.SDK.dll

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -594,6 +594,12 @@
<Compile Include="Start.Designer.cs"> <Compile Include="Start.Designer.cs">
<DependentUpon>Start.cs</DependentUpon> <DependentUpon>Start.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UIControls\Administrator\AdminDokTypGenerierung.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UIControls\Administrator\AdminDokTypGenerierung.Designer.cs">
<DependentUpon>AdminDokTypGenerierung.cs</DependentUpon>
</Compile>
<Compile Include="UIControls\Administrator\Dokumenttyp.cs"> <Compile Include="UIControls\Administrator\Dokumenttyp.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -794,6 +800,9 @@
<EmbeddedResource Include="Start.resx"> <EmbeddedResource Include="Start.resx">
<DependentUpon>Start.cs</DependentUpon> <DependentUpon>Start.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UIControls\Administrator\AdminDokTypGenerierung.resx">
<DependentUpon>AdminDokTypGenerierung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UIControls\Administrator\Dokumenttyp.resx"> <EmbeddedResource Include="UIControls\Administrator\Dokumenttyp.resx">
<DependentUpon>Dokumenttyp.cs</DependentUpon> <DependentUpon>Dokumenttyp.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

@ -62,9 +62,9 @@
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 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(129, 339); this.label2.Location = new System.Drawing.Point(129, 339);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(203, 26); this.label2.Size = new System.Drawing.Size(156, 26);
this.label2.TabIndex = 2; this.label2.TabIndex = 2;
this.label2.Text = "31. Dezember 2024"; this.label2.Text = "2. Januar 2025";
// //
// SplashScreen // SplashScreen
// //

@ -50,6 +50,7 @@
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam(); this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.ProgressCreateInOffice = new System.Windows.Forms.ProgressBar();
this.PnlPreview.SuspendLayout(); this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout(); this.GrpFnkt.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -267,6 +268,7 @@
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0; this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
this.ucAllgemeineDokumentParam1.check_error = ""; this.ucAllgemeineDokumentParam1.check_error = "";
this.ucAllgemeineDokumentParam1.checkpartner = true; this.ucAllgemeineDokumentParam1.checkpartner = true;
clsdocgendata1.anrede = null;
clsdocgendata1.bezeichnung = null; clsdocgendata1.bezeichnung = null;
clsdocgendata1.digitaleunterschrift = false; clsdocgendata1.digitaleunterschrift = false;
clsdocgendata1.dokumentdatum = null; clsdocgendata1.dokumentdatum = null;
@ -303,11 +305,20 @@
this.ucAllgemeineDokumentParam1.TabIndex = 0; this.ucAllgemeineDokumentParam1.TabIndex = 0;
this.ucAllgemeineDokumentParam1.uniqid = "f8c10a65-c251-4f8e-9ff7-4ae4d900a268"; this.ucAllgemeineDokumentParam1.uniqid = "f8c10a65-c251-4f8e-9ff7-4ae4d900a268";
// //
// ProgressCreateInOffice
//
this.ProgressCreateInOffice.Location = new System.Drawing.Point(579, 112);
this.ProgressCreateInOffice.Name = "ProgressCreateInOffice";
this.ProgressCreateInOffice.Size = new System.Drawing.Size(460, 23);
this.ProgressCreateInOffice.TabIndex = 20;
this.ProgressCreateInOffice.Visible = false;
//
// Dokumenterstellung // Dokumenterstellung
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1051, 679); this.ClientSize = new System.Drawing.Size(1051, 679);
this.Controls.Add(this.ProgressCreateInOffice);
this.Controls.Add(this.PnlPreview); this.Controls.Add(this.PnlPreview);
this.Controls.Add(this.sfButton3); this.Controls.Add(this.sfButton3);
this.Controls.Add(this.btnDokumenterstellen); this.Controls.Add(this.btnDokumenterstellen);
@ -348,5 +359,6 @@
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnOfficePrint; private System.Windows.Forms.Button btnOfficePrint;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.ProgressBar ProgressCreateInOffice;
} }
} }

@ -42,6 +42,7 @@ namespace OnDoc.DocMgmt
{ {
InitializeComponent(); InitializeComponent();
Broadcaster().AddListener(this); Broadcaster().AddListener(this);
Closing += Form_Closing;
} }
public Dokumenterstellung(int Partnernr, int Dokumenttpynr, int Profilnr) public Dokumenterstellung(int Partnernr, int Dokumenttpynr, int Profilnr)
@ -52,6 +53,7 @@ namespace OnDoc.DocMgmt
profilnr = Profilnr; profilnr = Profilnr;
Broadcaster().AddListener(this); Broadcaster().AddListener(this);
Closing += Form_Closing; Closing += Form_Closing;
} }
public Dokumenterstellung(int Partnernr, int Dokumenttypnr, int Profilnr, string Interaktion, string Showdoc) public Dokumenterstellung(int Partnernr, int Dokumenttypnr, int Profilnr, string Interaktion, string Showdoc)
@ -79,6 +81,11 @@ namespace OnDoc.DocMgmt
if (sender.Function == "Disable") { btnDokumenterstellen.Enabled = false; } else { btnDokumenterstellen.Enabled = true; } if (sender.Function == "Disable") { btnDokumenterstellen.Enabled = false; } else { btnDokumenterstellen.Enabled = true; }
} }
} }
if (message == "AdminDokErstellung")
{
Dokument_Erstellen();
}
} }
private void Dokumenterstellung_Load(object sender, EventArgs e) private void Dokumenterstellung_Load(object sender, EventArgs e)
@ -98,6 +105,7 @@ namespace OnDoc.DocMgmt
Security security = new Security(); Security security = new Security();
security.set_security(this); security.set_security(this);
security = null; security = null;
} }
@ -133,8 +141,11 @@ namespace OnDoc.DocMgmt
dB.add_parameter("@BARCODEFONTSIZE",""); dB.add_parameter("@BARCODEFONTSIZE","");
dB.add_parameter("@BarcodeKantenlaenge", ""); dB.add_parameter("@BarcodeKantenlaenge", "");
dB.Get_Tabledata("sp_get_barcodetype_and_value", true, false); dB.Get_Tabledata("sp_get_barcodetype_and_value", true, false);
dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString(); dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][2].ToString();
dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString(); dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString();
dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString();
dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString();
dB = null; dB = null;
} }
@ -144,7 +155,7 @@ namespace OnDoc.DocMgmt
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO); DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", ""); clsdok dok = new clsdok("", "", "");
Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid); Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1); dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes");
Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid); Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);

@ -463,7 +463,7 @@ namespace OnDoc.DocMgmt
panelword.Visible = true; panelword.Visible = true;
lbldokumentname.Text = tab.Text; lbldokumentname.Text = tab.Text;
Application.DoEvents(); Application.DoEvents();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1); dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1,AppParams.vbvorlagenmanagement=="Yes");
panelword.Visible = false; panelword.Visible = false;
Application.DoEvents(); Application.DoEvents();

@ -0,0 +1,368 @@
namespace OnDoc.UIControls.Administrator
{
partial class AdminDokTypGenerierung
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.TreeDokumenttyp = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.panel1 = new System.Windows.Forms.Panel();
this.chkboxaktive = new System.Windows.Forms.CheckBox();
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.groupBox4 = new System.Windows.Forms.GroupBox();
this.label18 = new System.Windows.Forms.Label();
this.chkfilloffice = new System.Windows.Forms.CheckBox();
this.cbboxcompatibilitymode = new System.Windows.Forms.ComboBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkinterop = new System.Windows.Forms.CheckBox();
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();
this.cbOfficeDokument = new System.Windows.Forms.CheckBox();
this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton();
this.btnerstellen = new System.Windows.Forms.Button();
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.SuspendLayout();
//
// groupBox7
//
this.groupBox7.Controls.Add(this.TreeDokumenttyp);
this.groupBox7.Controls.Add(this.panel1);
this.groupBox7.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox7.Location = new System.Drawing.Point(0, 0);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(282, 288);
this.groupBox7.TabIndex = 2;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Dokumenttypen";
//
// TreeDokumenttyp
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.ShowCheckBox = false;
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.TreeDokumenttyp.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(273, 198);
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(273, 198);
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);
//
// panel1
//
this.panel1.Controls.Add(this.chkboxaktive);
this.panel1.Controls.Add(this.txtFilter);
this.panel1.Controls.Add(this.rbBezeichnung);
this.panel1.Controls.Add(this.label16);
this.panel1.Controls.Add(this.rbNr);
this.panel1.Controls.Add(this.label15);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(3, 16);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(276, 71);
this.panel1.TabIndex = 10;
//
// chkboxaktive
//
this.chkboxaktive.AutoSize = true;
this.chkboxaktive.Checked = true;
this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkboxaktive.Location = new System.Drawing.Point(205, 43);
this.chkboxaktive.Name = "chkboxaktive";
this.chkboxaktive.Size = new System.Drawing.Size(55, 17);
this.chkboxaktive.TabIndex = 10;
this.chkboxaktive.Text = "aktive";
this.chkboxaktive.UseVisualStyleBackColor = true;
//
// txtFilter
//
this.txtFilter.Location = new System.Drawing.Point(69, 12);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Size = new System.Drawing.Size(191, 20);
this.txtFilter.TabIndex = 6;
this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown);
//
// rbBezeichnung
//
this.rbBezeichnung.AutoSize = true;
this.rbBezeichnung.Location = new System.Drawing.Point(111, 42);
this.rbBezeichnung.Name = "rbBezeichnung";
this.rbBezeichnung.Size = new System.Drawing.Size(87, 17);
this.rbBezeichnung.TabIndex = 9;
this.rbBezeichnung.Text = "Bezeichnung";
this.rbBezeichnung.UseVisualStyleBackColor = true;
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(12, 15);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(29, 13);
this.label16.TabIndex = 5;
this.label16.Text = "Filter";
//
// rbNr
//
this.rbNr.AutoSize = true;
this.rbNr.Checked = true;
this.rbNr.Location = new System.Drawing.Point(69, 42);
this.rbNr.Name = "rbNr";
this.rbNr.Size = new System.Drawing.Size(36, 17);
this.rbNr.TabIndex = 8;
this.rbNr.TabStop = true;
this.rbNr.Text = "Nr";
this.rbNr.UseVisualStyleBackColor = true;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(12, 44);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(26, 13);
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// groupBox4
//
this.groupBox4.Controls.Add(this.label18);
this.groupBox4.Controls.Add(this.chkfilloffice);
this.groupBox4.Controls.Add(this.cbboxcompatibilitymode);
this.groupBox4.Controls.Add(this.chkboxInOffice);
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);
this.groupBox4.Controls.Add(this.cbOfficeDokument);
this.groupBox4.Location = new System.Drawing.Point(301, 87);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(488, 102);
this.groupBox4.TabIndex = 25;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(277, 13);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(105, 13);
this.label18.TabIndex = 29;
this.label18.Text = "Kompatibilitätsmodus";
//
// chkfilloffice
//
this.chkfilloffice.AutoSize = true;
this.chkfilloffice.Location = new System.Drawing.Point(277, 63);
this.chkfilloffice.Name = "chkfilloffice";
this.chkfilloffice.Size = new System.Drawing.Size(117, 17);
this.chkfilloffice.TabIndex = 28;
this.chkfilloffice.Text = "Befüllung mit Office";
this.chkfilloffice.UseVisualStyleBackColor = true;
//
// cbboxcompatibilitymode
//
this.cbboxcompatibilitymode.FormattingEnabled = true;
this.cbboxcompatibilitymode.Items.AddRange(new object[] {
"Standard",
"Word 2010",
"Word 2013"});
this.cbboxcompatibilitymode.Location = new System.Drawing.Point(277, 32);
this.cbboxcompatibilitymode.Name = "cbboxcompatibilitymode";
this.cbboxcompatibilitymode.Size = new System.Drawing.Size(121, 21);
this.cbboxcompatibilitymode.TabIndex = 27;
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(11, 63);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// chkinterop
//
this.chkinterop.Location = new System.Drawing.Point(144, 63);
this.chkinterop.Name = "chkinterop";
this.chkinterop.Size = new System.Drawing.Size(127, 24);
this.chkinterop.TabIndex = 11;
this.chkinterop.Text = "Bearbeitung InterOP";
this.chkinterop.Visible = false;
//
// chkbearbeitungdirekt
//
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 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(11, 19);
this.cbbearbeitungzwingend.Name = "cbbearbeitungzwingend";
this.cbbearbeitungzwingend.Size = new System.Drawing.Size(221, 24);
this.cbbearbeitungzwingend.TabIndex = 9;
this.cbbearbeitungzwingend.Text = "Bearbeitung zwingend";
//
// cbPDFDirekteArchivierung
//
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69);
this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung";
this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24);
this.cbPDFDirekteArchivierung.TabIndex = 8;
this.cbPDFDirekteArchivierung.Text = "Direkte OnBase-Archvierung";
this.cbPDFDirekteArchivierung.Visible = false;
//
// cbPDFDokument
//
this.cbPDFDokument.Location = new System.Drawing.Point(392, 50);
this.cbPDFDokument.Name = "cbPDFDokument";
this.cbPDFDokument.Size = new System.Drawing.Size(280, 24);
this.cbPDFDokument.TabIndex = 6;
this.cbPDFDokument.Text = "Generierng als PDF";
this.cbPDFDokument.Visible = false;
//
// cbOfficeDokument
//
this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29);
this.cbOfficeDokument.Name = "cbOfficeDokument";
this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24);
this.cbOfficeDokument.TabIndex = 4;
this.cbOfficeDokument.Text = "Office-Dokument";
this.cbOfficeDokument.Visible = false;
//
// sfButton1
//
this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
this.sfButton1.Location = new System.Drawing.Point(301, 195);
this.sfButton1.Name = "sfButton1";
this.sfButton1.Size = new System.Drawing.Size(96, 28);
this.sfButton1.TabIndex = 26;
this.sfButton1.Text = "Speichern";
this.sfButton1.Click += new System.EventHandler(this.sfButton1_Click);
//
// btnerstellen
//
this.btnerstellen.Location = new System.Drawing.Point(312, 16);
this.btnerstellen.Name = "btnerstellen";
this.btnerstellen.Size = new System.Drawing.Size(136, 23);
this.btnerstellen.TabIndex = 27;
this.btnerstellen.Text = "Dokument erstellen";
this.btnerstellen.UseVisualStyleBackColor = true;
this.btnerstellen.Click += new System.EventHandler(this.btnerstellen_Click);
//
// AdminDokTypGenerierung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(919, 288);
this.Controls.Add(this.btnerstellen);
this.Controls.Add(this.sfButton1);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox7);
this.Name = "AdminDokTypGenerierung";
this.Text = "AdminDokumentGenerierung";
this.Load += new System.EventHandler(this.AdminDokTypGenerierung_Load);
this.groupBox7.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox7;
private Syncfusion.Windows.Forms.Tools.TreeViewAdv TreeDokumenttyp;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.CheckBox chkboxaktive;
private System.Windows.Forms.TextBox txtFilter;
private System.Windows.Forms.RadioButton rbBezeichnung;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.RadioButton rbNr;
private System.Windows.Forms.Label label15;
internal System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.CheckBox chkfilloffice;
private System.Windows.Forms.ComboBox cbboxcompatibilitymode;
internal System.Windows.Forms.CheckBox chkboxInOffice;
internal System.Windows.Forms.CheckBox chkinterop;
internal System.Windows.Forms.CheckBox chkbearbeitungdirekt;
internal System.Windows.Forms.CheckBox cbbearbeitungzwingend;
internal System.Windows.Forms.CheckBox cbPDFDirekteArchivierung;
internal System.Windows.Forms.CheckBox cbPDFDokument;
internal System.Windows.Forms.CheckBox cbOfficeDokument;
private Syncfusion.WinForms.Controls.SfButton sfButton1;
private System.Windows.Forms.Button btnerstellen;
}
}

@ -0,0 +1,152 @@
using BroadcastListener.Classes;
using Database;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Tools;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using BroadcastListener.Classes;
namespace OnDoc.UIControls.Administrator
{
public partial class AdminDokTypGenerierung : Form
{
DB db = new DB(AppParams.connectionstring);
private int dokumenttypnr = 0;
System.Data.DataTable treedata = new System.Data.DataTable();
public AdminDokTypGenerierung()
{
InitializeComponent();
}
private void AdminDokTypGenerierung_Load(object sender, EventArgs e)
{
update_tree();
return;
}
private void update_tree()
{
int count = txtFilter.Text.Trim().Count(f => f == ' ');
if (count > 0) { treedata.Rows.Clear(); }
TreeDokumenttyp.Nodes.Clear();
string sql = "";
sql = "Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp";
if (txtFilter.Text.Trim().Length > 0)
{
sql = sql + " where bezeichnung like '%" + txtFilter.Text.Replace(" ", "%") + "%'";
}
else
{
sql = sql + " where dokumenttypnr > 0";
}
if (chkboxaktive.Checked) { sql = sql + " and aktiv=1"; }
if (rbNr.Checked)
{
sql = sql + " order by id";
}
else
{
sql = sql + " order by bezeichnung";
}
db.Get_Tabledata(sql, false, true);
treedata = db.dsdaten.Tables[0].Copy();
try
{
foreach (DataRow r in treedata.Rows)
{
TreeNodeAdv nodeAdv = new TreeNodeAdv();
nodeAdv.Text = r["id"].ToString() + " " + r["Bezeichnung"].ToString();
nodeAdv.Tag = r["id"].ToString();
if (Convert.ToBoolean(r["aktiv"]) == false)
{
nodeAdv.Font = new System.Drawing.Font(nodeAdv.Font, FontStyle.Strikeout);
}
TreeDokumenttyp.Nodes.Add(nodeAdv);
}
}
catch { }
}
private void TreeDokumenttyp_AfterSelect(object sender, EventArgs e)
{
try
{
this.dokumenttypnr = Convert.ToInt32(TreeDokumenttyp.SelectedNode.Tag.ToString());
Update_Details(dokumenttypnr);
}
catch { }
}
private void Update_Details(int id)
{
int erstellungstyp = 0;
db.Get_Tabledata("Select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + dokumenttypnr.ToString(), false, true);
if (db.dsdaten.Tables[0].Rows.Count != 0)
{
erstellungstyp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
}
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr = " + dokumenttypnr.ToString(), false, true);
DataRow r = db.dsdaten.Tables[0].Rows[0];
try { chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true; } catch { chkbearbeitungdirekt.Checked = false; }
try { chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true; } catch { chkinterop.Checked = false; }
try { chkboxInOffice.Checked = Convert.ToBoolean(r["erstellungInOffice"]) == true; } catch { chkboxInOffice.Checked = false; };
try { cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitung_zwingend"]) == true; } catch { cbbearbeitungzwingend.Checked = false; }
try { chkfilloffice.Checked = Convert.ToBoolean(r["FillOffice"]) == true; } catch { chkfilloffice.Checked = false; }
}
private void sfButton1_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata_for_Update("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr.ToString(), false, true);
DataRow r = db.daten.Tables[0].Rows[0];
r["mutierer"] = AppParams.CurrentMitarbieter;
r["mutiert_am"] = DateTime.Now;
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
r["CompatibilityMode"] = cbboxcompatibilitymode.Text;
r["FillOffice"] = chkfilloffice.Checked == true;
r["bearbeitung_zwingend"] = this.cbbearbeitungzwingend.Checked == true;
db.Update_Data();
}
private void txtFilter_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
update_tree();
}
}
private void btnerstellen_Click(object sender, EventArgs e)
{
try
{
Broadcaster().Broadcast("AdminDokErstellung", new SenderInfo("AdminDokErstellung", "", this.dokumenttypnr.ToString()));
}
catch { }
}
}
}

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

@ -60,6 +60,9 @@
this.cbUnterschriftpruefung = new System.Windows.Forms.CheckBox(); this.cbUnterschriftpruefung = new System.Windows.Forms.CheckBox();
this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox(); this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.label18 = new System.Windows.Forms.Label();
this.chkfilloffice = new System.Windows.Forms.CheckBox();
this.cbboxcompatibilitymode = new System.Windows.Forms.ComboBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox(); this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkinterop = new System.Windows.Forms.CheckBox(); this.chkinterop = new System.Windows.Forms.CheckBox();
this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox(); this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox();
@ -385,6 +388,9 @@
// //
// groupBox4 // groupBox4
// //
this.groupBox4.Controls.Add(this.label18);
this.groupBox4.Controls.Add(this.chkfilloffice);
this.groupBox4.Controls.Add(this.cbboxcompatibilitymode);
this.groupBox4.Controls.Add(this.chkboxInOffice); this.groupBox4.Controls.Add(this.chkboxInOffice);
this.groupBox4.Controls.Add(this.chkinterop); this.groupBox4.Controls.Add(this.chkinterop);
this.groupBox4.Controls.Add(this.chkbearbeitungdirekt); this.groupBox4.Controls.Add(this.chkbearbeitungdirekt);
@ -399,6 +405,37 @@
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion"; this.groupBox4.Text = "Dokument-Produktion";
// //
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(277, 13);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(105, 13);
this.label18.TabIndex = 29;
this.label18.Text = "Kompatibilitätsmodus";
//
// chkfilloffice
//
this.chkfilloffice.AutoSize = true;
this.chkfilloffice.Location = new System.Drawing.Point(277, 63);
this.chkfilloffice.Name = "chkfilloffice";
this.chkfilloffice.Size = new System.Drawing.Size(117, 17);
this.chkfilloffice.TabIndex = 28;
this.chkfilloffice.Text = "Befüllung mit Office";
this.chkfilloffice.UseVisualStyleBackColor = true;
//
// cbboxcompatibilitymode
//
this.cbboxcompatibilitymode.FormattingEnabled = true;
this.cbboxcompatibilitymode.Items.AddRange(new object[] {
"Standard",
"Word 2010",
"Word 2013"});
this.cbboxcompatibilitymode.Location = new System.Drawing.Point(277, 32);
this.cbboxcompatibilitymode.Name = "cbboxcompatibilitymode";
this.cbboxcompatibilitymode.Size = new System.Drawing.Size(121, 21);
this.cbboxcompatibilitymode.TabIndex = 27;
//
// chkboxInOffice // chkboxInOffice
// //
this.chkboxInOffice.Location = new System.Drawing.Point(11, 78); this.chkboxInOffice.Location = new System.Drawing.Point(11, 78);
@ -1478,6 +1515,7 @@
this.GrpBewilligung.ResumeLayout(false); this.GrpBewilligung.ResumeLayout(false);
this.GrpBewilligung.PerformLayout(); this.GrpBewilligung.PerformLayout();
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.TreeDokumentArt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.TreeDokumentArt)).EndInit();
this.GroupBox2.ResumeLayout(false); this.GroupBox2.ResumeLayout(false);
@ -1615,5 +1653,8 @@
internal System.Windows.Forms.Label label17; internal System.Windows.Forms.Label label17;
private Syncfusion.WinForms.ListView.SfComboBox cbboxarchiv; private Syncfusion.WinForms.ListView.SfComboBox cbboxarchiv;
private System.Windows.Forms.Button btnSaveVorlagenfeld; private System.Windows.Forms.Button btnSaveVorlagenfeld;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.CheckBox chkfilloffice;
private System.Windows.Forms.ComboBox cbboxcompatibilitymode;
} }
} }

@ -182,6 +182,8 @@ namespace OnDoc.UIControls.Administrator
this.listBox1.DataSource = db.dsdaten.Tables[0]; this.listBox1.DataSource = db.dsdaten.Tables[0];
this.listBox1.DisplayMember = "Bezeichnung"; this.listBox1.DisplayMember = "Bezeichnung";
this.listBox1.ValueMember = "vorlagenfeldregelnr"; this.listBox1.ValueMember = "vorlagenfeldregelnr";
if (r["CompatibilityMode"].ToString()=="") { cbboxcompatibilitymode.SelectedIndex = 0; } else { cbboxcompatibilitymode.Text = r["CompatibilityMode"].ToString(); }
try { chkfilloffice.Checked = Convert.ToBoolean(r["FillOffice"]) == true; } catch { chkfilloffice .Checked = false; }
//try //try
//{ //{
// chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true; // chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
@ -348,6 +350,8 @@ namespace OnDoc.UIControls.Administrator
r["interop"] = chkinterop.Checked == true; r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true; r["erstellungInOffice"] = chkboxInOffice.Checked == true;
r["physisches_archiv"]=cbboxarchiv.SelectedValue; r["physisches_archiv"]=cbboxarchiv.SelectedValue;
r["CompatibilityMode"] = cbboxcompatibilitymode.Text;
r["FillOffice"]=chkfilloffice.Checked == true;
//if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; } //if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
//if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; } //if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
//if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; } //if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }

@ -245,7 +245,7 @@ namespace OnDoc.UIControls.Administrator
vbf.Update_Vorlage(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString(), AppParams.connectionstring, AppParams.CurrentMitarbieter); vbf.Update_Vorlage(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString(), AppParams.connectionstring, AppParams.CurrentMitarbieter);
TreeOfficeVorlagen_AfterSelect(sender, e); TreeOfficeVorlagen_AfterSelect(sender, e);
vbf = null; vbf = null;
lblFilename.Text = System.IO.Path.GetFileName(openFileDialog1.FileName);
} }
else else
{ {
@ -253,6 +253,7 @@ namespace OnDoc.UIControls.Administrator
db.save_vorlage_to_db(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString()); db.save_vorlage_to_db(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString());
db = null; db = null;
TreeOfficeVorlagen_AfterSelect(sender, e); TreeOfficeVorlagen_AfterSelect(sender, e);
lblFilename.Text = System.IO.Path.GetFileName(openFileDialog1.FileName);
} }
} }

@ -151,6 +151,8 @@ namespace OnDoc.UICintrols
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton4 = new System.Windows.Forms.RibbonButton();
this.ctxMenuDokList.SuspendLayout(); this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@ -1074,6 +1076,7 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen); this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen);
this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung); this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung);
this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse); this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3);
this.RibbonTabAdmin.Text = "Administration"; this.RibbonTabAdmin.Text = "Administration";
// //
// RibbonPanelDiverses // RibbonPanelDiverses
@ -1237,6 +1240,22 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694); this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7; this.dokwerte1.TabIndex = 7;
// //
// ribbonPanel3
//
this.ribbonPanel3.ButtonMoreVisible = false;
this.ribbonPanel3.Items.Add(this.ribbonButton4);
this.ribbonPanel3.Name = "ribbonPanel3";
this.ribbonPanel3.Text = "";
this.ribbonPanel3.Click += new System.EventHandler(this.ribbonPanel3_Click);
//
// ribbonButton4
//
this.ribbonButton4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.Image")));
this.ribbonButton4.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.LargeImage")));
this.ribbonButton4.Name = "ribbonButton4";
this.ribbonButton4.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.SmallImage")));
this.ribbonButton4.Text = "Art der Dokumentgenerierung";
//
// DokList // DokList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1383,5 +1402,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonLabel ribbonLabelToApprove; private System.Windows.Forms.RibbonLabel ribbonLabelToApprove;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1; private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
private UIControls.DocPreview docPreview1; private UIControls.DocPreview docPreview1;
private System.Windows.Forms.RibbonPanel ribbonPanel3;
private System.Windows.Forms.RibbonButton ribbonButton4;
} }
} }

@ -96,6 +96,10 @@ namespace OnDoc.UICintrols
this.Separate_Vorschau_offen = false; this.Separate_Vorschau_offen = false;
} }
} }
if (sender.SenderName is "AdminDokErstellung")
{
createnewdoc(0, Convert.ToInt32(sender.Details));
}
} }
@ -1998,6 +2002,12 @@ namespace OnDoc.UICintrols
{ {
update_currentview(); update_currentview();
} }
private void ribbonPanel3_Click(object sender, EventArgs e)
{
AdminDokTypGenerierung ag = new AdminDokTypGenerierung();
ag.Show();
}
} }
} }

@ -273,6 +273,27 @@
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg== TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButton4.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButton4.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
</value> </value>
</data> </data>
<data name="RibbonButtonArchivToOnBase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="RibbonButtonArchivToOnBase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

@ -60,11 +60,16 @@ namespace OnDoc.UIControls
public int barcode_horizontal = 0; public int barcode_horizontal = 0;
public string barcode_type = ""; public string barcode_type = "";
public string barcode_content = ""; public string barcode_content = "";
public bool Erstellung_in_Office = false;
public bool FillOffice = false;
public string CompatibilityMode = "";
public UCAllgemeineDokumentParam() public UCAllgemeineDokumentParam()
{ {
InitializeComponent(); InitializeComponent();
docgendata = new clsdocgendata(); docgendata = new clsdocgendata();
} }
public void Refresh_Details() public void Refresh_Details()
@ -178,7 +183,9 @@ namespace OnDoc.UIControls
this.DateTerminText.Visible = false; this.DateTerminText.Visible = false;
this.DateTermin.Value = new DateTime(1900, 01, 01); this.DateTermin.Value = new DateTime(1900, 01, 01);
} }
this.Erstellung_in_Office = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["ErstellungInOffice"]);
this.FillOffice = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["FillOffice"]);
this.CompatibilityMode = db.dsdaten.Tables[0].Rows[0]["CompatibilityMode"].ToString();
db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + dr["physisches_archiv"].ToString(), false, true); db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + dr["physisches_archiv"].ToString(), false, true);
barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString(); barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
@ -200,6 +207,7 @@ namespace OnDoc.UIControls
this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]); this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]);
this.barcode_type = db.dsdaten.Tables[0].Rows[0]["BarcodeType"].ToString(); this.barcode_type = db.dsdaten.Tables[0].Rows[0]["BarcodeType"].ToString();
this.barcode_content = db.dsdaten.Tables[0].Rows[0]["DatamatrixContent"].ToString(); this.barcode_content = db.dsdaten.Tables[0].Rows[0]["DatamatrixContent"].ToString();
if (this.ErstellungInOffice == false) if (this.ErstellungInOffice == false)
{ {
@ -574,6 +582,10 @@ namespace OnDoc.UIControls
dokdata.barcode_textposition = AppParams.barcodetextposition; dokdata.barcode_textposition = AppParams.barcodetextposition;
dokdata.barcode_type = barcode_type; dokdata.barcode_type = barcode_type;
dokdata.barcode_content = barcode_content; dokdata.barcode_content = barcode_content;
dokdata.Erstellung_in_Office = this.Erstellung_in_Office;
dokdata.FillOffice = this.FillOffice;
dokdata.CompatibilityMode= this.CompatibilityMode;
if (DateTerminText.Text == "") if (DateTerminText.Text == "")
{ {
dokdata.Termin = "01.01.1900"; dokdata.Termin = "01.01.1900";
@ -582,7 +594,7 @@ namespace OnDoc.UIControls
{ {
dokdata.Termin = DateTermin.Value.ToString(); dokdata.Termin = DateTermin.Value.ToString();
} }
dokdata.Bezeichnung = txtbezeichnung.ToString(); dokdata.Bezeichnung = txtbezeichnung.Text.ToString();
dokdata.zustelladresse = docgendata.zustelladresse; dokdata.zustelladresse = docgendata.zustelladresse;
dokdata.anrede = docgendata.anrede; dokdata.anrede = docgendata.anrede;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1,4 +1,5 @@
delete EDKB02DMS.zip delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll "C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll
copy OnDocClient.zip H:\NextCloud\ZZDownload copy OnDocClient.zip H:\NextCloud\ZZDownload
pause pause

Binary file not shown.

Binary file not shown.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
vbBarcodes
</name>
</assembly>
<members>
<member name="T:vbBarcodes.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

@ -1 +1 @@
53ea5514e091712a8bb31248afe9891604d7751162650d0f293873d893270215 d08cdd3b8d95d982d497a25026b1169d2ae8047dc2be950156b91549e6bd9c3f

@ -361,3 +361,8 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.AdminDokTypGenerierung.resources

Binary file not shown.

Binary file not shown.

@ -57,8 +57,15 @@ namespace DOCGEN.Generator
this.Office_Fill_DocIO= Office_Fill_DocIO; this.Office_Fill_DocIO= Office_Fill_DocIO;
} }
public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep=0) public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep=0, bool vbfilemanagement = false)
{ {
useoffice = docdata.Erstellung_in_Office;
try
{
if (docdata.FillOffice == true) { Office_Fill_DocIO = 0; } else { Office_Fill_DocIO = 1; }
}
catch { Office_Fill_DocIO=0; }
DB db = new DB(connectionstring); DB db = new DB(connectionstring);
DataTable dt = new DataTable(); DataTable dt = new DataTable();
DataTable dt2 = new DataTable(); DataTable dt2 = new DataTable();
@ -90,7 +97,7 @@ namespace DOCGEN.Generator
OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "",""); OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","");
Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid); Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid);
dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO); dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO, vbfilemanagement);
Logging.Logging.Debug("Generate_Word_in_Office", "Ende", dokumentid); Logging.Logging.Debug("Generate_Word_in_Office", "Ende", dokumentid);
oo = null; oo = null;
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
vbBarcodes
</name>
</assembly>
<members>
<member name="T:vbBarcodes.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

@ -141,3 +141,7 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.pdb
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.pdb
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\MW6.SDK.dll

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -64,6 +64,7 @@ namespace Database
{ {
try try
{ {
Logging.Logging.Debug("", "EDOKA_DB:Get_Tabledata Start:" + Tablename, "");
if (sp_params == null && SP_Parameters.Rows.Count > 0) if (sp_params == null && SP_Parameters.Rows.Count > 0)
{ {
sp_params = SP_Parameters.Copy(); sp_params = SP_Parameters.Copy();

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save