Update 20260514

This commit is contained in:
Stefan Hutter
2026-05-14 10:49:27 +02:00
parent d3d7b06872
commit 83a0703324
247 changed files with 900388 additions and 222 deletions
+11
View File
@@ -481,6 +481,12 @@
<Compile Include="Diverses\frmMail.Designer.cs">
<DependentUpon>frmMail.cs</DependentUpon>
</Compile>
<Compile Include="Diverses\frmVorlagenuebernahme.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Diverses\frmVorlagenuebernahme.Designer.cs">
<DependentUpon>frmVorlagenuebernahme.cs</DependentUpon>
</Compile>
<Compile Include="Diverses\InputDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -796,6 +802,7 @@
</Compile>
<EmbeddedResource Include="Diverses\ApprovalNotes.resx">
<DependentUpon>ApprovalNotes.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Diverses\DokHistory.resx">
<DependentUpon>DokHistory.cs</DependentUpon>
@@ -815,6 +822,9 @@
<EmbeddedResource Include="Diverses\frmMail.resx">
<DependentUpon>frmMail.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Diverses\frmVorlagenuebernahme.resx">
<DependentUpon>frmVorlagenuebernahme.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Diverses\InputDialog.resx">
<DependentUpon>InputDialog.cs</DependentUpon>
</EmbeddedResource>
@@ -918,6 +928,7 @@
</EmbeddedResource>
<EmbeddedResource Include="UIControls\Administrator\Admin_Taableeditor.resx">
<DependentUpon>Admin_Taableeditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="UIControls\Administrator\Dokumenttyp.resx">
<DependentUpon>Dokumenttyp.cs</DependentUpon>
+1 -1
View File
@@ -65,7 +65,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(472, 26);
this.label2.TabIndex = 2;
this.label2.Text = "26. April 2026";
this.label2.Text = "8. Mai 2026";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label2.Click += new System.EventHandler(this.label2_Click);
//
+65
View File
@@ -0,0 +1,65 @@
namespace OnDoc.Diverses
{
partial class frmVorlagenuebernahme
{
/// <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()
{
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCellsWithLastColumnFill;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.PreviewRowHeight = 35;
this.sfDataGrid1.Size = new System.Drawing.Size(1087, 521);
this.sfDataGrid1.TabIndex = 1;
this.sfDataGrid1.Text = "sfDataGrid1";
//
// frmVorlagenuebernahme
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1087, 521);
this.Controls.Add(this.sfDataGrid1);
this.Name = "frmVorlagenuebernahme";
this.Text = "Vorlagen-Synchronisation";
this.Load += new System.EventHandler(this.frmVorlagenuebernahme_Load);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
}
}
+30
View File
@@ -0,0 +1,30 @@
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 Database;
using OnDoc.Klassen;
namespace OnDoc.Diverses
{
public partial class frmVorlagenuebernahme : Form
{
public frmVorlagenuebernahme()
{
InitializeComponent();
}
private void frmVorlagenuebernahme_Load(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("select * from OnDoc_Admin_VorlagenSync order by desc", false, true);
sfDataGrid1.DataSource = db.dsdaten.Tables[0];
}
}
}
+120
View File
@@ -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>
+1 -1
View File
@@ -283,7 +283,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm
DgAAAk1TRnQBSQFMAgEBCAEAAcABAQHAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DgAAAk1TRnQBSQFMAgEBCAEAAdABAQHQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+103 -7
View File
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
@@ -56,6 +57,7 @@
this.tsbtncopy = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.GrpUnterschrifte = new System.Windows.Forms.GroupBox();
this.cbSignierungSyncfusion = new System.Windows.Forms.CheckBox();
this.cbfaksimileStandard = new System.Windows.Forms.CheckBox();
this.lblStandard = new System.Windows.Forms.Label();
this.lbUnterschriftStandard = new System.Windows.Forms.ListBox();
@@ -146,6 +148,11 @@
this.lblfeldregeliddesc = new System.Windows.Forms.Label();
this.lblID = new System.Windows.Forms.Label();
this.lbliddesc = new System.Windows.Forms.Label();
this.tabPageAdv3 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.sfDataGrid2 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.btnSetSync = new System.Windows.Forms.Button();
this.label21 = new System.Windows.Forms.Label();
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.TreeDokumenttyp = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.panel1 = new System.Windows.Forms.Panel();
@@ -155,7 +162,8 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.cbSignierungSyncfusion = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.label22 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -183,6 +191,8 @@
this.groupBox5.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.grpVorlagenfeld.SuspendLayout();
this.tabPageAdv3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).BeginInit();
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
@@ -193,12 +203,14 @@
this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1019, 760);
this.tabControlAdv1.Controls.Add(this.tabPageAdv1);
this.tabControlAdv1.Controls.Add(this.tabPageAdv2);
this.tabControlAdv1.Controls.Add(this.tabPageAdv3);
this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControlAdv1.Location = new System.Drawing.Point(284, 2);
this.tabControlAdv1.Name = "tabControlAdv1";
this.tabControlAdv1.Size = new System.Drawing.Size(1019, 760);
this.tabControlAdv1.TabIndex = 0;
this.tabControlAdv1.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null;
this.tabControlAdv1.SelectedIndexChanged += new System.EventHandler(this.tabControlAdv1_SelectedIndexChanged);
//
// tabPageAdv1
//
@@ -371,6 +383,14 @@
this.GrpUnterschrifte.TabStop = false;
this.GrpUnterschrifte.Text = "Unterschriften";
//
// cbSignierungSyncfusion
//
this.cbSignierungSyncfusion.Location = new System.Drawing.Point(293, 49);
this.cbSignierungSyncfusion.Name = "cbSignierungSyncfusion";
this.cbSignierungSyncfusion.Size = new System.Drawing.Size(163, 24);
this.cbSignierungSyncfusion.TabIndex = 28;
this.cbSignierungSyncfusion.Text = "Signierung Syncfusion";
//
// cbfaksimileStandard
//
this.cbfaksimileStandard.Location = new System.Drawing.Point(163, 49);
@@ -1437,6 +1457,65 @@
this.lbliddesc.TabIndex = 0;
this.lbliddesc.Text = "ID";
//
// tabPageAdv3
//
this.tabPageAdv3.Controls.Add(this.label22);
this.tabPageAdv3.Controls.Add(this.sfDataGrid2);
this.tabPageAdv3.Controls.Add(this.btnSetSync);
this.tabPageAdv3.Controls.Add(this.label21);
this.tabPageAdv3.Controls.Add(this.dateTimePicker1);
this.tabPageAdv3.Image = null;
this.tabPageAdv3.ImageSize = new System.Drawing.Size(20, 20);
this.tabPageAdv3.Location = new System.Drawing.Point(1, 25);
this.tabPageAdv3.Name = "tabPageAdv3";
this.tabPageAdv3.ShowCloseButton = true;
this.tabPageAdv3.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv3.TabIndex = 3;
this.tabPageAdv3.Text = "Synchronisation";
this.tabPageAdv3.ThemesEnabled = false;
//
// sfDataGrid2
//
this.sfDataGrid2.AccessibleName = "Table";
this.sfDataGrid2.AllowFiltering = true;
this.sfDataGrid2.AllowGrouping = false;
this.sfDataGrid2.AllowResizingColumns = true;
this.sfDataGrid2.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
this.sfDataGrid2.CopyOption = Syncfusion.WinForms.DataGrid.Enums.CopyOptions.None;
this.sfDataGrid2.Location = new System.Drawing.Point(36, 49);
this.sfDataGrid2.Name = "sfDataGrid2";
this.sfDataGrid2.PreviewRowHeight = 35;
this.sfDataGrid2.Size = new System.Drawing.Size(484, 356);
this.sfDataGrid2.TabIndex = 10;
//
// btnSetSync
//
this.btnSetSync.Location = new System.Drawing.Point(36, 453);
this.btnSetSync.Name = "btnSetSync";
this.btnSetSync.Size = new System.Drawing.Size(75, 23);
this.btnSetSync.TabIndex = 9;
this.btnSetSync.Text = "Eintragen";
this.btnSetSync.UseVisualStyleBackColor = true;
this.btnSetSync.Click += new System.EventHandler(this.btnSetSync_Click);
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(33, 418);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(81, 13);
this.label21.TabIndex = 8;
this.label21.Text = "Übernahme Per";
//
// dateTimePicker1
//
this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dateTimePicker1.Location = new System.Drawing.Point(120, 418);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(99, 20);
this.dateTimePicker1.TabIndex = 7;
this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
//
// groupBox7
//
this.groupBox7.Controls.Add(this.TreeDokumenttyp);
@@ -1571,13 +1650,20 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// cbSignierungSyncfusion
// contextMenuStrip1
//
this.cbSignierungSyncfusion.Location = new System.Drawing.Point(293, 49);
this.cbSignierungSyncfusion.Name = "cbSignierungSyncfusion";
this.cbSignierungSyncfusion.Size = new System.Drawing.Size(163, 24);
this.cbSignierungSyncfusion.TabIndex = 28;
this.cbSignierungSyncfusion.Text = "Signiereung Syncfusion";
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(33, 19);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(51, 13);
this.label22.TabIndex = 11;
this.label22.Text = "Elemente";
//
// Dokumenttyp
//
@@ -1629,6 +1715,9 @@
this.toolStrip1.PerformLayout();
this.grpVorlagenfeld.ResumeLayout(false);
this.grpVorlagenfeld.PerformLayout();
this.tabPageAdv3.ResumeLayout(false);
this.tabPageAdv3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).EndInit();
this.groupBox7.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
@@ -1755,5 +1844,12 @@
private System.Windows.Forms.TextBox txturibeschreibung;
internal System.Windows.Forms.CheckBox cbfaksimileStandard;
internal System.Windows.Forms.CheckBox cbSignierungSyncfusion;
private Syncfusion.Windows.Forms.Tools.TabPageAdv tabPageAdv3;
private System.Windows.Forms.DateTimePicker dateTimePicker1;
private System.Windows.Forms.Button btnSetSync;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid2;
private System.Windows.Forms.Label label22;
}
}
@@ -563,6 +563,65 @@ namespace OnDoc.UIControls.Administrator
vdb = null;
}
private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
{
}
private void tabControlAdv1_SelectedIndexChanged(object sender, EventArgs e)
{
if (tabControlAdv1.SelectedTab.Text == "Synchronisation")
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from OnDoc_Admin_VorlagenSync_Param order by id", false, true);
db.dsdaten.Tables[0].Columns.Add("Sync", typeof(bool));
this.sfDataGrid2.DataSource=db.dsdaten.Tables[0];
sfDataGrid2.Columns[0].Width = 0;
sfDataGrid2.Columns[1].Width = 0;
db = null;
}
}
private void btnSetSync_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("delete from OnDoc_Admin_VorlagenSync where sync_datum='"+this.dateTimePicker1.Value+"' and dokumenttypnr="+this.dokumenttypnr.ToString()+"");
db.Get_Tabledata_for_Update("Select top 1 * from OnDoc_Admin_VorlagenSync where id=-1", false, true);
DataRow dr = db.daten.Tables[0].NewRow();
DataTable sourcedata = sfDataGrid2.DataSource as DataTable;
foreach (DataRow sdr in sourcedata.Rows)
{
try {
if (Convert.ToBoolean(sdr["Sync"]) == true)
{
dr[sdr["OnDoc_Admin_VorlagenSync_Attribut"].ToString()] = true;
}
else
{
dr[sdr["OnDoc_Admin_VorlagenSync_Attribut"].ToString()] = false;
}
}
catch
{
dr[sdr["OnDoc_Admin_VorlagenSync_Attribut"].ToString()] = false;
}
}
dr["dokumenttypnr"] = this.dokumenttypnr;
dr["sync_datum"] =this.dateTimePicker1.Value;
dr["erstellt_am"] = DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbeiter;
dr["sync_done"] = false;
dr["sync_return"] = "";
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db = null;
}
}
public static class SOExtension
{
@@ -123,6 +123,9 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>227, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>353, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
@@ -93,7 +93,13 @@ namespace OnDoc.UIControls.Administrator
{
var data = e.NewObject as dynamic;
data["aktiv"] = true;
try
{
data["aktiv"] = true;
}
catch
{}
data["erstellt_am"] = DateTime.Now;
data["mutiert_am"] = DateTime.Now;
data["mutierer"]=AppParams.CurrentMitarbeiter;
+1 -1
View File
@@ -384,7 +384,7 @@ namespace OnDoc.UIControls
{ error = 1; }
}
dg = null;
}
//DateTime t = DateTime.Now;
//DateTime now = DateTime.Now;
-1
View File
@@ -547,7 +547,6 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ShowGroupDropArea = true;
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(1709, 341);
// this.sfDataGrid1.Style.DragPreviewRowStyle.Font = new System.Drawing.Font("Segoe UI", 9F);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.ValidationMode = Syncfusion.WinForms.DataGrid.Enums.GridValidationMode.InView;
this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1);
+42 -7
View File
@@ -382,9 +382,10 @@ namespace OnDoc.Versandstrasse
}
}
int doccount = 0;
foreach (TreeNodeAdv dokumentnode in node.Nodes)
{
doccount = doccount + 1;
if (dokumentnode.Tag.ToString().Contains("ATT"))
{
hastattachment = true;
@@ -407,7 +408,26 @@ namespace OnDoc.Versandstrasse
// anzbp = anzbp + 1;
//}
//Versandstrasse möglich
////Versandstrasse möglich
//rbb1post.Enabled = true;
//rbb2post.Enabled = true;
//rbapost.Enabled = true;
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) == 5 && nodecounter == 0)
{
forceeinschreiben = true;
}
if (forceeinschreiben == false && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) == 5 && nodecounter > 0)
{
// set_nodeimage(dokumentnode, 0);
add_errormessage(4, "Im Versand-Couvert liegt ein Dokument, welches als EINSCHREIBEN versendet wird, jedoch nicht an erster Position ist.");
versandbereit = false;
}
// rbb1post.Enabled = false;
// rbb2post.Enabled = false;
// rbapost.Enabled = false;
// rbb2post.Checked = false;
//
//}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
@@ -416,7 +436,7 @@ namespace OnDoc.Versandstrasse
}
else
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1)
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1 && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) != 5)
{
set_nodeimage(dokumentnode, 2);
versandbereit = false;
@@ -1332,24 +1352,31 @@ namespace OnDoc.Versandstrasse
catch { }
}
bool forceeinschreiben = false;
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
try
{
this.panelVerify.Visible = false;
Cursor.Current = Cursors.WaitCursor;
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
{
forceeinschreiben = false;
if (Verify_Couvert(node) == false)
{
GrpPaketDetails.Enabled = false;
return;
}
GrpPaketDetails.Enabled = true;
Versandpaket paket = node.TagObject as Versandpaket; ;
if (forceeinschreiben) { rbeinschreiben.Checked = true; }
rbapost.Enabled = true;
rbb1post.Enabled = true;
rbb2post.Enabled = true;
switch (paket.Versandoption)
{
case "A_POST":
@@ -1359,11 +1386,19 @@ namespace OnDoc.Versandstrasse
case "B2_POST":
rbb2post.Checked = true; break;
case "EINSCHREIBEN":
rbeinschreiben.Checked = true;break;
rbeinschreiben.Checked = true;
if (forceeinschreiben)
{
rbapost.Enabled = false;
rbb1post.Enabled = false;
rbb2post.Enabled = false;
}
break;
default:
rbb2post.Checked = true; break;
}
if (paket.GAS != "")
{
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 +1 @@
f74478b4a0ac42d3dba296cb26673592056c0e57296874c2de78585756689a3d
fa977e92a9b327d15e0cf97befdb2b1c499ce37f6373e56c6731b75f4449f0e3
@@ -469,3 +469,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDocOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.dll.config
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.frmVorlagenuebernahme.resources
Binary file not shown.
Binary file not shown.
Binary file not shown.