diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll
index cfa10177..e68065b2 100644
Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ
diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll
index cf83520f..7971d6b6 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb
index 0f212a2a..900f00b5 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ
diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
index 7754d212..f4da99cd 100644
Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ
diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
index cf83520f..7971d6b6 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ
diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
index 0f212a2a..900f00b5 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ
diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ
diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ
diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache
index dfd54874..77d83c39 100644
Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ
diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs
index 259a4e43..49b61ffd 100644
--- a/Client/Diverses/SplashScreen.Designer.cs
+++ b/Client/Diverses/SplashScreen.Designer.cs
@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(138, 26);
this.label2.TabIndex = 2;
- this.label2.Text = "6. März 2025";
+ this.label2.Text = "9. März 2025";
//
// SplashScreen
//
diff --git a/Client/DocMgmt/Dokumentpaket.Designer.cs b/Client/DocMgmt/Dokumentpaket.Designer.cs
index 43f887f2..018d81e4 100644
--- a/Client/DocMgmt/Dokumentpaket.Designer.cs
+++ b/Client/DocMgmt/Dokumentpaket.Designer.cs
@@ -345,7 +345,7 @@
this.groupBox1.Size = new System.Drawing.Size(249, 149);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Partnerdaten";
+ this.groupBox1.Text = "Kundendaten";
//
// btnSearchBP
//
diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs
index bc6b649a..d620be0a 100644
--- a/Client/UIControls/DokList.Designer.cs
+++ b/Client/UIControls/DokList.Designer.cs
@@ -64,6 +64,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -167,7 +168,6 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
- this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -207,7 +207,7 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
- this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
+ this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
@@ -282,7 +282,7 @@ namespace OnDoc.UICintrols
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
- this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
@@ -491,6 +491,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
+ // docPreview1
+ //
+ this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
+ this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.docPreview1.Location = new System.Drawing.Point(0, 0);
+ this.docPreview1.Name = "docPreview1";
+ this.docPreview1.Size = new System.Drawing.Size(1709, 347);
+ this.docPreview1.TabIndex = 0;
+ this.docPreview1.ZoomPercentage = 0;
+ //
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -1392,16 +1402,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
- // docPreview1
- //
- this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
- this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.docPreview1.Location = new System.Drawing.Point(0, 0);
- this.docPreview1.Name = "docPreview1";
- this.docPreview1.Size = new System.Drawing.Size(1709, 347);
- this.docPreview1.TabIndex = 0;
- this.docPreview1.ZoomPercentage = 0;
- //
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
diff --git a/Client/UIControls/Serienbrief.Designer.cs b/Client/UIControls/Serienbrief.Designer.cs
index dfe168c9..d63b6e28 100644
--- a/Client/UIControls/Serienbrief.Designer.cs
+++ b/Client/UIControls/Serienbrief.Designer.cs
@@ -31,10 +31,10 @@
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = 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();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv5 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv6 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv7 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv8 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief));
this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox();
this.grpFaktura = new System.Windows.Forms.GroupBox();
@@ -134,6 +134,9 @@
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
+ this.btnblexport = new System.Windows.Forms.Button();
+ this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
+ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.GrpDokumentInhalt.SuspendLayout();
this.grpFaktura.SuspendLayout();
this.pnlprogress.SuspendLayout();
@@ -303,6 +306,7 @@
//
// grpDruckstapel
//
+ this.grpDruckstapel.Controls.Add(this.btnblexport);
this.grpDruckstapel.Controls.Add(this.panel2);
this.grpDruckstapel.Controls.Add(this.button2);
this.grpDruckstapel.Controls.Add(this.button1);
@@ -552,10 +556,10 @@
this.rbzustaendigkube.AutoSize = true;
this.rbzustaendigkube.Location = new System.Drawing.Point(22, 19);
this.rbzustaendigkube.Name = "rbzustaendigkube";
- this.rbzustaendigkube.Size = new System.Drawing.Size(157, 17);
+ this.rbzustaendigkube.Size = new System.Drawing.Size(155, 17);
this.rbzustaendigkube.TabIndex = 0;
this.rbzustaendigkube.TabStop = true;
- this.rbzustaendigkube.Text = "Kundenberater des Partners";
+ this.rbzustaendigkube.Text = "Kundenberater des Kunden";
this.rbzustaendigkube.UseVisualStyleBackColor = true;
//
// groupBox5
@@ -853,51 +857,51 @@
this.treeViewAdv1.Location = new System.Drawing.Point(3, 16);
this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv1.Name = "treeViewAdv1";
- treeNodeAdv1.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv1.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv1.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv1.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv1.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv1.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv1.EnsureDefaultOptionedChild = true;
- treeNodeAdv1.MultiLine = true;
- treeNodeAdv1.ShowLine = true;
- treeNodeAdv1.Text = "In Bearbeitung";
- treeNodeAdv2.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv2.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv2.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv2.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv2.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv2.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv2.EnsureDefaultOptionedChild = true;
- treeNodeAdv2.MultiLine = true;
- treeNodeAdv2.ShowLine = true;
- treeNodeAdv2.Text = "Fehlerhaft";
- treeNodeAdv3.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv3.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv3.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv3.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv3.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv3.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv3.EnsureDefaultOptionedChild = true;
- treeNodeAdv3.MultiLine = true;
- treeNodeAdv3.ShowLine = true;
- treeNodeAdv3.Text = "Generierte Dokumente";
- treeNodeAdv4.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv4.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv4.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv4.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv4.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv4.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv4.EnsureDefaultOptionedChild = true;
- treeNodeAdv4.MultiLine = true;
- treeNodeAdv4.ShowLine = true;
- treeNodeAdv4.Text = "Abgeschlossen";
+ treeNodeAdv5.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv5.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv5.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv5.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv5.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv5.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv5.EnsureDefaultOptionedChild = true;
+ treeNodeAdv5.MultiLine = true;
+ treeNodeAdv5.ShowLine = true;
+ treeNodeAdv5.Text = "In Bearbeitung";
+ treeNodeAdv6.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv6.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv6.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv6.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv6.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv6.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv6.EnsureDefaultOptionedChild = true;
+ treeNodeAdv6.MultiLine = true;
+ treeNodeAdv6.ShowLine = true;
+ treeNodeAdv6.Text = "Fehlerhaft";
+ treeNodeAdv7.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv7.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv7.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv7.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv7.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv7.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv7.EnsureDefaultOptionedChild = true;
+ treeNodeAdv7.MultiLine = true;
+ treeNodeAdv7.ShowLine = true;
+ treeNodeAdv7.Text = "Generierte Dokumente";
+ treeNodeAdv8.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv8.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv8.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv8.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv8.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv8.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv8.EnsureDefaultOptionedChild = true;
+ treeNodeAdv8.MultiLine = true;
+ treeNodeAdv8.ShowLine = true;
+ treeNodeAdv8.Text = "Abgeschlossen";
this.treeViewAdv1.Nodes.AddRange(new Syncfusion.Windows.Forms.Tools.TreeNodeAdv[] {
- treeNodeAdv1,
- treeNodeAdv2,
- treeNodeAdv3,
- treeNodeAdv4});
+ treeNodeAdv5,
+ treeNodeAdv6,
+ treeNodeAdv7,
+ treeNodeAdv8});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(230, 563);
this.treeViewAdv1.TabIndex = 3;
@@ -1167,7 +1171,7 @@
this.ribbonbuttonaddpartner.LargeImage = global::OnDoc.Properties.Resources.Partner_32x32_32;
this.ribbonbuttonaddpartner.Name = "ribbonbuttonaddpartner";
this.ribbonbuttonaddpartner.SmallImage = global::OnDoc.Properties.Resources.Partner_16x16_32;
- this.ribbonbuttonaddpartner.Text = "Partner hinzufügen";
+ this.ribbonbuttonaddpartner.Text = "Kunde hinzufügen";
this.ribbonbuttonaddpartner.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.ribbonbuttonaddpartner.Click += new System.EventHandler(this.ribbonbuttonaddpartner_Click);
//
@@ -1178,7 +1182,7 @@
this.ribbonButtonPartnerPruefen.LargeImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_32x32_32;
this.ribbonButtonPartnerPruefen.Name = "ribbonButtonPartnerPruefen";
this.ribbonButtonPartnerPruefen.SmallImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_24x24_32;
- this.ribbonButtonPartnerPruefen.Text = "Partnerliste prüfen";
+ this.ribbonButtonPartnerPruefen.Text = "Kundenliste prüfen";
this.ribbonButtonPartnerPruefen.Click += new System.EventHandler(this.ribbonButton2_Click);
//
// ribbonPanel8
@@ -1308,6 +1312,17 @@
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
+ // btnblexport
+ //
+ this.btnblexport.Location = new System.Drawing.Point(232, 136);
+ this.btnblexport.Name = "btnblexport";
+ this.btnblexport.Size = new System.Drawing.Size(239, 23);
+ this.btnblexport.TabIndex = 22;
+ this.btnblexport.Text = "Banklagernd-Dokumente exportieren";
+ this.btnblexport.UseVisualStyleBackColor = true;
+ this.btnblexport.Visible = false;
+ this.btnblexport.Click += new System.EventHandler(this.btnblexport_Click);
+ //
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1462,5 +1477,8 @@
private System.Windows.Forms.RibbonButton ribbonbuttonAbgelehnt;
private System.Windows.Forms.RibbonButton ribbonButtonToApproval;
private System.Windows.Forms.RibbonButton ribbonButton1;
+ private System.Windows.Forms.Button btnblexport;
+ private Syncfusion.Windows.Forms.FolderBrowser folderBrowser1;
+ private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
}
}
\ No newline at end of file
diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs
index 390bb83d..0f14381b 100644
--- a/Client/UIControls/Serienbrief.cs
+++ b/Client/UIControls/Serienbrief.cs
@@ -522,10 +522,10 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = true;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Width = 50;
}
-
- sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
+ sfDataGridEmpfaenger.Columns[0].HeaderText = "Kunden-Nr";
+ //sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
- sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
+ //sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
@@ -538,6 +538,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
+
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
catch { }
@@ -1153,7 +1154,7 @@ namespace OnDoc.UIControls
int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
DB db = new DB(AppParams.connectionstring);
- db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ipartnernr, false, true);
+ db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + ipartnernr, false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].NewRow();
@@ -1162,8 +1163,17 @@ namespace OnDoc.UIControls
dr[i] = "";
}
dr["partnernr"] = Convert.ToInt32(ipartnernr);
+ if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) == 1)
+ {
+
+ dr["kurzbezeichnung"] = "SALDIERT: "+db.dsdaten.Tables[0].Rows[0][0].ToString();
+ }
+ else
+ {
dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString();
- dr["STATUS"] = 0;
+
+ }
+ dr["STATUS"] = 0;
dr["FEHLERCODE"] = 0;
dr["IntEintragnr"] = lastid;
@@ -1237,6 +1247,18 @@ namespace OnDoc.UIControls
// Logging.Logging.Debug("dr1 ", "OnDoc", dr1["Status"].ToString());
try
{
+ if (Convert.ToInt32(dr1["status"]) == -9)
+ {
+ dr1["Status"] = 0;
+ if (dr1[1].ToString().Contains("SALDIERT:"))
+ {
+ }
+ else
+ {
+ dr1[1] = "SALDIERT: " + dr1[1].ToString();
+ }
+ }
+
if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) > 0)
{
dr1["Fehlercode"] = dt.Rows[i]["Fehlercode"];
@@ -2029,6 +2051,11 @@ namespace OnDoc.UIControls
int stapel = 1;
int i = 0;
int anzahl_stapel = (normalcount / 100) + 1;
+ if (blcount > 0)
+ {
+ btnblexport.Visible = true;
+ System.Windows.Forms.Application.DoEvents();
+ }
Stream[] streams = null;
if (normalcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[normalcount];
init_progressbar("Druckstapel generieren", dv.Count);
@@ -2065,46 +2092,46 @@ namespace OnDoc.UIControls
}
save_stapel(stapel, ref streams);
}
- if (blcount > 0)
- {
- i = 0;
- anzahl_stapel = (blcount / 100) + 1;
- streams = null;
- if (blcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[blcount];
- stapel = stapel + 1;
- i = 0;
- foreach (DataRowView rowView in dv)
- {
- add_progress();
- System.Data.DataRow dr = rowView.Row;
- if (dr["blkunde"].ToString() == "1")
- {
-
- db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
- var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
- if (stream.Length > 0)
- {
- streams[i] = stream;
- i++;
- if (i >= stapelgroesse)
- {
- save_stapel(stapel, ref streams);
-
- i = 0;
- if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
- else
- {
- streams = new Stream[dv.Count - (stapel * stapelgroesse)];
- }
- //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
- stapel++;
- }
- }
- }
- }
- save_stapel(stapel, ref streams);
+ //if (blcount > 0)
+ //{
+ // i = 0;
+ // anzahl_stapel = (blcount / 100) + 1;
+ // streams = null;
+ // if (blcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[blcount];
+ // stapel = stapel + 1;
+ // i = 0;
+ // foreach (DataRowView rowView in dv)
+ // {
+ // add_progress();
+ // System.Data.DataRow dr = rowView.Row;
+ // if (dr["blkunde"].ToString() == "1")
+ // {
+
+ // db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
+ // var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
+ // if (stream.Length > 0)
+ // {
+ // streams[i] = stream;
+ // i++;
+ // if (i >= stapelgroesse)
+ // {
+ // save_stapel(stapel, ref streams);
+
+ // i = 0;
+ // if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
+ // else
+ // {
+ // streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ // }
+ // //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ // stapel++;
+ // }
+ // }
+ // }
+ // }
+ // save_stapel(stapel, ref streams);
- }
+ //}
//PdfDocumentBase.Merge(finalDoc, streams);
//FileStream fs = new FileStream(AppParams.tempdir+sb.serienbriefnr.ToString()+".pdf",FileMode.Create);
//finalDoc.Save(fs);
@@ -2698,14 +2725,50 @@ namespace OnDoc.UIControls
if (dataRow["blkunde"].ToString() == "1")
{
- e.Style.BackColor = Color.Red;
+ e.Style.BackColor = Color.FromArgb(250, 141, 118);
-
+
+ }
+
+ }
+ if (e.Column.MappingName == "Kurzbezeichnung")
+ {
+ if (dataRow["kurzbezeichnung"].ToString().Contains("SALDIERT:"))
+ {
+ e.Style.BackColor = Color.FromArgb(250, 141, 118);
+ }
+ }
+ }
+
+ private void btnblexport_Click(object sender, EventArgs e)
+ {
+ folderBrowserDialog1.ShowNewFolderButton = true;
+ folderBrowserDialog1.SelectedPath=AppParams.tempdir;
+ if (folderBrowserDialog1.ShowDialog() == DialogResult.OK)
+ {
+ DB db = new DB(AppParams.connectionstring);
+ FileHelper fh = new FileHelper();
+ DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
+ foreach (DataRowView rowView in dv)
+ {
+
+ System.Data.DataRow dr = rowView.Row;
+ if (dr["blkunde"].ToString() == "1")
+ {
+
+ db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
+ string filename = dr[0].ToString() + "_" + dr["dokumentid"].ToString() + ".pdf";
+ fh.SaveBase64ToFile(db.dsdaten.Tables[0].Rows[0][0].ToString(),folderBrowserDialog1.SelectedPath+@"\"+filename );
+ }
}
+ db = null;
+ fh = null;
}
+
+
+
}
-
}
}
diff --git a/Client/UIControls/Serienbrief.resx b/Client/UIControls/Serienbrief.resx
index c9abfe21..214462b3 100644
--- a/Client/UIControls/Serienbrief.resx
+++ b/Client/UIControls/Serienbrief.resx
@@ -133,22 +133,28 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+ vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+ vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
+ vQAADr0BR/uQrQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
17, 17
+
+ 441, 17
+
+
+ 574, 17
+
\ No newline at end of file
diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ
diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ
diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe
index 0ad5b0a3..25d8cce2 100644
Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ
diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb
index 77ef648b..ab9c3b4d 100644
Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ
diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip
index 77c2972a..6f73351a 100644
Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ
diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll
index 21397e21..6bfb008f 100644
Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache
index e3ad83d9..484cb8da 100644
Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ
diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache
index 1e3bb828..c952bf9c 100644
Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ
diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index f2fa846c..5a13ae12 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources
index 90239711..81bcefab 100644
Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index 0ad5b0a3..25d8cce2 100644
Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ
diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb
index 77ef648b..ab9c3b4d 100644
Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ
diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll
index 21397e21..6bfb008f 100644
Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ
diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ
diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
index 97431ad5..d4ec46e3 100644
Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ
diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ
diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ
diff --git a/Database/db.cs b/Database/db.cs
index 0a59e201..ade71f5f 100644
--- a/Database/db.cs
+++ b/Database/db.cs
@@ -1837,7 +1837,7 @@ namespace Database
add_parameter("@manr", mitarbeiternr.ToString());
add_parameter("@vertrag", "0");
add_parameter("@doktypnr", sb.dokumenttypnr.ToString());
- Get_Tabledata("dbo.sp_edex_sb_check_partner", true, false);
+ Get_Tabledata("dbo.OnDoc_sb_check_partner", true, false);
return dsdaten.Tables[0];
}
diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ
diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ
diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll
index cfa10177..e68065b2 100644
Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ
diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb
index 1c08dd6f..377d6b18 100644
Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ
diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
index 928bf674..e3d8872c 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ
diff --git a/ToolsDoksImportExport/Form1.Designer.cs b/ToolsDoksImportExport/Form1.Designer.cs
index ede90796..4cc66574 100644
--- a/ToolsDoksImportExport/Form1.Designer.cs
+++ b/ToolsDoksImportExport/Form1.Designer.cs
@@ -36,6 +36,16 @@
this.label3 = new System.Windows.Forms.Label();
this.btnExport = new System.Windows.Forms.Button();
this.btnImport = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.button2 = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// label1
@@ -56,7 +66,7 @@
//
// txtDokumentID
//
- this.txtDokumentID.Location = new System.Drawing.Point(137, 59);
+ this.txtDokumentID.Location = new System.Drawing.Point(115, 30);
this.txtDokumentID.Name = "txtDokumentID";
this.txtDokumentID.Size = new System.Drawing.Size(185, 20);
this.txtDokumentID.TabIndex = 3;
@@ -64,7 +74,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(34, 59);
+ this.label2.Location = new System.Drawing.Point(12, 30);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(73, 13);
this.label2.TabIndex = 2;
@@ -72,7 +82,7 @@
//
// txtFilename
//
- this.txtFilename.Location = new System.Drawing.Point(137, 94);
+ this.txtFilename.Location = new System.Drawing.Point(115, 52);
this.txtFilename.Name = "txtFilename";
this.txtFilename.Size = new System.Drawing.Size(492, 20);
this.txtFilename.TabIndex = 5;
@@ -80,7 +90,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(34, 94);
+ this.label3.Location = new System.Drawing.Point(12, 52);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(54, 13);
this.label3.TabIndex = 4;
@@ -88,7 +98,7 @@
//
// btnExport
//
- this.btnExport.Location = new System.Drawing.Point(37, 163);
+ this.btnExport.Location = new System.Drawing.Point(10, 91);
this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(75, 23);
this.btnExport.TabIndex = 6;
@@ -98,7 +108,7 @@
//
// btnImport
//
- this.btnImport.Location = new System.Drawing.Point(137, 163);
+ this.btnImport.Location = new System.Drawing.Point(115, 91);
this.btnImport.Name = "btnImport";
this.btnImport.Size = new System.Drawing.Size(75, 23);
this.btnImport.TabIndex = 7;
@@ -106,21 +116,103 @@
this.btnImport.UseVisualStyleBackColor = true;
this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.btnImport);
+ this.groupBox1.Controls.Add(this.txtDokumentID);
+ this.groupBox1.Controls.Add(this.btnExport);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.txtFilename);
+ this.groupBox1.Location = new System.Drawing.Point(37, 88);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(940, 133);
+ this.groupBox1.TabIndex = 8;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Dokument";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.label4);
+ this.groupBox2.Controls.Add(this.button1);
+ this.groupBox2.Controls.Add(this.textBox1);
+ this.groupBox2.Controls.Add(this.button2);
+ this.groupBox2.Controls.Add(this.label5);
+ this.groupBox2.Controls.Add(this.textBox2);
+ this.groupBox2.Location = new System.Drawing.Point(37, 227);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(940, 133);
+ this.groupBox2.TabIndex = 9;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "GridSettings";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(12, 30);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(18, 13);
+ this.label4.TabIndex = 2;
+ this.label4.Text = "ID";
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(115, 91);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 7;
+ this.button1.Text = "Import";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(115, 30);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(185, 20);
+ this.textBox1.TabIndex = 3;
+ //
+ // button2
+ //
+ this.button2.Location = new System.Drawing.Point(10, 91);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(75, 23);
+ this.button2.TabIndex = 6;
+ this.button2.Text = "Export";
+ this.button2.UseVisualStyleBackColor = true;
+ this.button2.Click += new System.EventHandler(this.button2_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(12, 52);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(54, 13);
+ this.label5.TabIndex = 4;
+ this.label5.Text = "FileName:";
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(115, 52);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(492, 20);
+ this.textBox2.TabIndex = 5;
+ //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(989, 495);
- this.Controls.Add(this.btnImport);
- this.Controls.Add(this.btnExport);
- this.Controls.Add(this.txtFilename);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.txtDokumentID);
- this.Controls.Add(this.label2);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.txtConnctionstring);
this.Controls.Add(this.label1);
this.Name = "Form1";
this.Text = "Import / Export from Doks";
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -136,6 +228,14 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnExport;
private System.Windows.Forms.Button btnImport;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox textBox2;
}
}
diff --git a/ToolsDoksImportExport/Form1.cs b/ToolsDoksImportExport/Form1.cs
index d30aaf39..ed633c63 100644
--- a/ToolsDoksImportExport/Form1.cs
+++ b/ToolsDoksImportExport/Form1.cs
@@ -24,7 +24,7 @@ namespace ToolsDoksImportExport
try
{
DB db = new DB(txtConnctionstring.Text);
- clsdok d = new clsdok("", "", "");
+ clsdok d = new clsdok("", "", "","");
d = db.GetDocumentAsBase64(this.txtDokumentID.Text);
System.IO.File.WriteAllBytes(this.txtFilename.Text, Convert.FromBase64String(d.dokument));
db = null;
@@ -46,5 +46,24 @@ namespace ToolsDoksImportExport
}
catch (Exception ex) { MessageBox.Show(ex.Message); }
}
+
+ private void button2_Click(object sender, EventArgs e)
+ {
+ DB db = new DB(txtConnctionstring.Text);
+ db.Get_Tabledata("Select gridsettings from mitarbeiter_gridsettings where id=" + textBox1.Text, false, true);
+ System.IO.File.WriteAllBytes(this.textBox2.Text, Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
+ MessageBox.Show("Export erfolgreich");
+ db = null;
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ Byte[] bytes = System.IO.File.ReadAllBytes(this.textBox2.Text);
+ string b64 = Convert.ToBase64String(bytes);
+ DB db = new DB(txtConnctionstring.Text);
+ db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b64 + "'");
+ MessageBox.Show("Import erfolgreich");
+ db = null;
+ }
}
}
diff --git a/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 5a13ae12..8e34e5c3 100644
Binary files a/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/ToolsDoksImportExport/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/ToolsDoksImportExport/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index d73c015d..3e4bec79 100644
Binary files a/ToolsDoksImportExport/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/ToolsDoksImportExport/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache
index adba0174..3927e384 100644
Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache differ
diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.GenerateResource.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.GenerateResource.cache
index 5d147c93..4479ea19 100644
Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.GenerateResource.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.GenerateResource.cache differ