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

updfate 20250919

Browse Source
This commit is contained in:
Stefan Hutter
2025-09-19 14:20:47 +02:00
parent 98dc8ed0cb
commit d81d620468
2488 changed files with 1833953 additions and 103283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
Client/Versandstrasse/Versandstrasse.Designer.cs generated
View File

@@ -41,6 +41,7 @@
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.externesPDFHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.imageList1_sik = new System.Windows.Forms.ImageList(this.components);
this.panelPrepare = new System.Windows.Forms.Panel();
@@ -110,6 +111,8 @@
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNewCouvert = new System.Windows.Forms.RibbonButton();
this.ribbonSeparator2 = new System.Windows.Forms.RibbonSeparator();
this.ribbonAddPDF = new System.Windows.Forms.RibbonButton();
this.ribbonSeparator1 = new System.Windows.Forms.RibbonSeparator();
this.ribbonButtonDokPreview = new System.Windows.Forms.RibbonButton();
this.ribbonchkadresse = new System.Windows.Forms.RibbonCheckBox();
@@ -121,6 +124,7 @@
this.lblprieveiwbezeichnung = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.lblAttachment = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.lblerror = new System.Windows.Forms.Label();
this.pnlpostkorb = new System.Windows.Forms.Panel();
@@ -134,6 +138,8 @@
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
this.lblserienbrief = new System.Windows.Forms.Label();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.ribbonbtnAktualisieren = new System.Windows.Forms.RibbonButton();
this.contextMenuStrip1.SuspendLayout();
this.panelPrepare.SuspendLayout();
this.GrpPaketDetails.SuspendLayout();
@@ -161,19 +167,27 @@
//
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.löschenToolStripMenuItem});
this.löschenToolStripMenuItem,
this.externesPDFHinzufügenToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(132, 28);
this.contextMenuStrip1.Size = new System.Drawing.Size(205, 48);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click);
//
// löschenToolStripMenuItem
//
this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem";
this.löschenToolStripMenuItem.Size = new System.Drawing.Size(131, 24);
this.löschenToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
this.löschenToolStripMenuItem.Text = "Löschen";
this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click);
//
// externesPDFHinzufügenToolStripMenuItem
//
this.externesPDFHinzufügenToolStripMenuItem.Name = "externesPDFHinzufügenToolStripMenuItem";
this.externesPDFHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
this.externesPDFHinzufügenToolStripMenuItem.Text = "Externes PDF hinzufügen";
this.externesPDFHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.externesPDFHinzufügenToolStripMenuItem_Click);
//
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
@@ -211,7 +225,7 @@
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(198, 28);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(525, 25);
this.label4.Size = new System.Drawing.Size(437, 20);
this.label4.TabIndex = 0;
this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten....";
this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@@ -315,7 +329,7 @@
this.rbc5normal.AutoSize = true;
this.rbc5normal.Location = new System.Drawing.Point(123, 2);
this.rbc5normal.Name = "rbc5normal";
this.rbc5normal.Size = new System.Drawing.Size(158, 19);
this.rbc5normal.Size = new System.Drawing.Size(135, 17);
this.rbc5normal.TabIndex = 1;
this.rbc5normal.TabStop = true;
this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)";
@@ -327,7 +341,7 @@
this.rbc5mini.AutoSize = true;
this.rbc5mini.Location = new System.Drawing.Point(5, 2);
this.rbc5mini.Name = "rbc5mini";
this.rbc5mini.Size = new System.Drawing.Size(134, 19);
this.rbc5mini.Size = new System.Drawing.Size(115, 17);
this.rbc5mini.TabIndex = 0;
this.rbc5mini.TabStop = true;
this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)";
@@ -339,7 +353,7 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(3, 36);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(167, 15);
this.label5.Size = new System.Drawing.Size(147, 13);
this.label5.TabIndex = 13;
this.label5.Text = "(Rückversand: max. 5 Blätter)";
//
@@ -348,7 +362,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(267, 41);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(106, 15);
this.label6.Size = new System.Drawing.Size(93, 13);
this.label6.TabIndex = 10;
this.label6.Text = "Gewählte Adresse";
//
@@ -373,7 +387,6 @@
treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.Black;
this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)});
this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(259, 174);
//
//
//
@@ -411,7 +424,7 @@
this.chkGAS.AutoSize = true;
this.chkGAS.Location = new System.Drawing.Point(6, 13);
this.chkGAS.Name = "chkGAS";
this.chkGAS.Size = new System.Drawing.Size(203, 19);
this.chkGAS.Size = new System.Drawing.Size(181, 17);
this.chkGAS.TabIndex = 0;
this.chkGAS.Text = "Frankiertes Rückantwortcouvert ";
this.chkGAS.UseVisualStyleBackColor = true;
@@ -445,7 +458,7 @@
this.txtAnzahlSeiten.Location = new System.Drawing.Point(151, 152);
this.txtAnzahlSeiten.Name = "txtAnzahlSeiten";
this.txtAnzahlSeiten.ReadOnly = true;
this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlSeiten.TabIndex = 17;
//
// txtAnzahlDokumente
@@ -455,7 +468,7 @@
this.txtAnzahlDokumente.Location = new System.Drawing.Point(151, 133);
this.txtAnzahlDokumente.Name = "txtAnzahlDokumente";
this.txtAnzahlDokumente.ReadOnly = true;
this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlDokumente.TabIndex = 16;
//
// label15
@@ -464,7 +477,7 @@
this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label15.Location = new System.Drawing.Point(10, 152);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(113, 17);
this.label15.Size = new System.Drawing.Size(89, 13);
this.label15.TabIndex = 15;
this.label15.Text = "Anzahl Seiten:";
//
@@ -474,7 +487,7 @@
this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label14.Location = new System.Drawing.Point(9, 133);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(148, 17);
this.label14.Size = new System.Drawing.Size(117, 13);
this.label14.TabIndex = 14;
this.label14.Text = "Anzahl Dokumente:";
//
@@ -508,7 +521,7 @@
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label7.Location = new System.Drawing.Point(5, 14);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(93, 17);
this.label7.Size = new System.Drawing.Size(72, 13);
this.label7.TabIndex = 10;
this.label7.Text = "Versandart:";
//
@@ -528,7 +541,7 @@
this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label8.Location = new System.Drawing.Point(5, 40);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(167, 17);
this.label8.Size = new System.Drawing.Size(132, 13);
this.label8.TabIndex = 11;
this.label8.Text = "Rückantwort-Adresse:";
//
@@ -539,7 +552,7 @@
this.txtVersandoption.Location = new System.Drawing.Point(151, 14);
this.txtVersandoption.Name = "txtVersandoption";
this.txtVersandoption.ReadOnly = true;
this.txtVersandoption.Size = new System.Drawing.Size(265, 16);
this.txtVersandoption.Size = new System.Drawing.Size(265, 13);
this.txtVersandoption.TabIndex = 12;
//
// lblprueftext
@@ -547,7 +560,7 @@
this.lblprueftext.AutoSize = true;
this.lblprueftext.Location = new System.Drawing.Point(10, 174);
this.lblprueftext.Name = "lblprueftext";
this.lblprueftext.Size = new System.Drawing.Size(48, 15);
this.lblprueftext.Size = new System.Drawing.Size(43, 13);
this.lblprueftext.TabIndex = 6;
this.lblprueftext.Text = "Prüftext";
//
@@ -591,7 +604,7 @@
this.lblprueftextsb2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblprueftextsb2.Location = new System.Drawing.Point(9, 184);
this.lblprueftextsb2.Name = "lblprueftextsb2";
this.lblprueftextsb2.Size = new System.Drawing.Size(64, 17);
this.lblprueftextsb2.Size = new System.Drawing.Size(51, 13);
this.lblprueftextsb2.TabIndex = 20;
this.lblprueftextsb2.Text = "Prüftext";
//
@@ -602,7 +615,7 @@
this.txtAnzahlDokumetneSB.Location = new System.Drawing.Point(151, 126);
this.txtAnzahlDokumetneSB.Name = "txtAnzahlDokumetneSB";
this.txtAnzahlDokumetneSB.ReadOnly = true;
this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlDokumetneSB.TabIndex = 19;
//
// txtRückantwortSB
@@ -622,7 +635,7 @@
this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label16.Location = new System.Drawing.Point(9, 126);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(148, 17);
this.label16.Size = new System.Drawing.Size(117, 13);
this.label16.TabIndex = 18;
this.label16.Text = "Anzahl Dokumente:";
//
@@ -632,7 +645,7 @@
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.Location = new System.Drawing.Point(6, 7);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(93, 17);
this.label9.Size = new System.Drawing.Size(72, 13);
this.label9.TabIndex = 14;
this.label9.Text = "Versandart:";
//
@@ -642,7 +655,7 @@
this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label10.Location = new System.Drawing.Point(6, 33);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(167, 17);
this.label10.Size = new System.Drawing.Size(132, 13);
this.label10.TabIndex = 15;
this.label10.Text = "Rückantwort-Adresse:";
//
@@ -653,7 +666,7 @@
this.txtversandartsb.Location = new System.Drawing.Point(152, 7);
this.txtversandartsb.Name = "txtversandartsb";
this.txtversandartsb.ReadOnly = true;
this.txtversandartsb.Size = new System.Drawing.Size(265, 16);
this.txtversandartsb.Size = new System.Drawing.Size(265, 13);
this.txtversandartsb.TabIndex = 16;
//
// btnsendserienbrief
@@ -686,7 +699,7 @@
this.lblprueftextSB.AutoSize = true;
this.lblprueftextSB.Location = new System.Drawing.Point(9, 154);
this.lblprueftextSB.Name = "lblprueftextSB";
this.lblprueftextSB.Size = new System.Drawing.Size(48, 15);
this.lblprueftextSB.Size = new System.Drawing.Size(43, 13);
this.lblprueftextSB.TabIndex = 6;
this.lblprueftextSB.Text = "Prüftext";
//
@@ -712,7 +725,7 @@
this.rbb1post.Checked = true;
this.rbb1post.Location = new System.Drawing.Point(74, 21);
this.rbb1post.Name = "rbb1post";
this.rbb1post.Size = new System.Drawing.Size(71, 19);
this.rbb1post.Size = new System.Drawing.Size(62, 17);
this.rbb1post.TabIndex = 5;
this.rbb1post.TabStop = true;
this.rbb1post.Text = "B1-Post";
@@ -724,7 +737,7 @@
this.rbb2post.AutoSize = true;
this.rbb2post.Location = new System.Drawing.Point(6, 21);
this.rbb2post.Name = "rbb2post";
this.rbb2post.Size = new System.Drawing.Size(71, 19);
this.rbb2post.Size = new System.Drawing.Size(62, 17);
this.rbb2post.TabIndex = 4;
this.rbb2post.Text = "B2-Post";
this.rbb2post.UseVisualStyleBackColor = true;
@@ -735,7 +748,7 @@
this.rbversandoption3.AutoSize = true;
this.rbversandoption3.Location = new System.Drawing.Point(222, 21);
this.rbversandoption3.Name = "rbversandoption3";
this.rbversandoption3.Size = new System.Drawing.Size(238, 19);
this.rbversandoption3.Size = new System.Drawing.Size(207, 17);
this.rbversandoption3.TabIndex = 2;
this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen";
this.rbversandoption3.UseVisualStyleBackColor = true;
@@ -746,7 +759,7 @@
this.rbapost.AutoSize = true;
this.rbapost.Location = new System.Drawing.Point(142, 21);
this.rbapost.Name = "rbapost";
this.rbapost.Size = new System.Drawing.Size(63, 19);
this.rbapost.Size = new System.Drawing.Size(56, 17);
this.rbapost.TabIndex = 3;
this.rbapost.Text = "A-Post";
this.rbapost.UseVisualStyleBackColor = true;
@@ -757,7 +770,7 @@
this.rbversandoption2.AutoSize = true;
this.rbversandoption2.Location = new System.Drawing.Point(222, 21);
this.rbversandoption2.Name = "rbversandoption2";
this.rbversandoption2.Size = new System.Drawing.Size(228, 19);
this.rbversandoption2.Size = new System.Drawing.Size(197, 17);
this.rbversandoption2.TabIndex = 1;
this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen";
this.rbversandoption2.UseVisualStyleBackColor = true;
@@ -768,7 +781,7 @@
this.rbversandoption1.AutoSize = true;
this.rbversandoption1.Location = new System.Drawing.Point(222, 21);
this.rbversandoption1.Name = "rbversandoption1";
this.rbversandoption1.Size = new System.Drawing.Size(191, 19);
this.rbversandoption1.Size = new System.Drawing.Size(166, 17);
this.rbversandoption1.TabIndex = 0;
this.rbversandoption1.Text = "Hauptadresse und Versandart";
this.rbversandoption1.UseVisualStyleBackColor = true;
@@ -800,7 +813,6 @@
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(462, 530);
this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1;
@@ -814,7 +826,7 @@
this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdv1.HelpTextControl.Name = "helpText";
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(55, 17);
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15);
this.treeViewAdv1.HelpTextControl.TabIndex = 0;
this.treeViewAdv1.HelpTextControl.Text = "help text";
this.treeViewAdv1.HideSelection = false;
@@ -851,7 +863,7 @@
this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdv1.ToolTipControl.Name = "toolTip";
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(46, 17);
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15);
this.treeViewAdv1.ToolTipControl.TabIndex = 1;
this.treeViewAdv1.ToolTipControl.Text = "toolTip";
this.treeViewAdv1.TransparentControls = true;
@@ -940,7 +952,7 @@
this.textBox4.Location = new System.Drawing.Point(156, 165);
this.textBox4.Name = "textBox4";
this.textBox4.ReadOnly = true;
this.textBox4.Size = new System.Drawing.Size(265, 16);
this.textBox4.Size = new System.Drawing.Size(265, 13);
this.textBox4.TabIndex = 25;
//
// label17
@@ -949,7 +961,7 @@
this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(12, 165);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(113, 17);
this.label17.Size = new System.Drawing.Size(89, 13);
this.label17.TabIndex = 24;
this.label17.Text = "Anzahl Seiten:";
//
@@ -960,7 +972,7 @@
this.textBox3.Location = new System.Drawing.Point(156, 141);
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.textBox3.Size = new System.Drawing.Size(265, 16);
this.textBox3.Size = new System.Drawing.Size(265, 13);
this.textBox3.TabIndex = 23;
//
// label13
@@ -969,7 +981,7 @@
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(12, 141);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(148, 17);
this.label13.Size = new System.Drawing.Size(117, 13);
this.label13.TabIndex = 22;
this.label13.Text = "Anzahl Dokumente:";
//
@@ -990,7 +1002,7 @@
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(10, 19);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(93, 17);
this.label11.Size = new System.Drawing.Size(72, 13);
this.label11.TabIndex = 18;
this.label11.Text = "Versandart:";
//
@@ -1000,7 +1012,7 @@
this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label12.Location = new System.Drawing.Point(10, 45);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(167, 17);
this.label12.Size = new System.Drawing.Size(132, 13);
this.label12.TabIndex = 19;
this.label12.Text = "Rückantwort-Adresse:";
//
@@ -1011,7 +1023,7 @@
this.textBox2.Location = new System.Drawing.Point(156, 19);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(265, 16);
this.textBox2.Size = new System.Drawing.Size(265, 13);
this.textBox2.TabIndex = 20;
//
// treeViewAdvCouverts
@@ -1030,7 +1042,6 @@
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 397);
this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ContextMenuStrip = this.contextMenuStrip2;
@@ -1044,7 +1055,7 @@
this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdvCouverts.HelpTextControl.Name = "helpText";
this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(55, 17);
this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15);
this.treeViewAdvCouverts.HelpTextControl.TabIndex = 0;
this.treeViewAdvCouverts.HelpTextControl.Text = "help text";
this.treeViewAdvCouverts.HideSelection = false;
@@ -1081,7 +1092,7 @@
this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip";
this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(46, 17);
this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15);
this.treeViewAdvCouverts.ToolTipControl.TabIndex = 1;
this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip";
this.treeViewAdvCouverts.TransparentControls = true;
@@ -1094,19 +1105,20 @@
this.versandCouvertLöschenToolStripMenuItem,
this.versandCouvertÖffnenbearbeitenToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip2";
this.contextMenuStrip2.Size = new System.Drawing.Size(313, 52);
this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48);
this.contextMenuStrip2.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip2_Opening);
//
// versandCouvertLöschenToolStripMenuItem
//
this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem";
this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(312, 24);
this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22);
this.versandCouvertLöschenToolStripMenuItem.Text = "Versand-Couvert löschen";
this.versandCouvertLöschenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertLöschenToolStripMenuItem_Click);
//
// versandCouvertÖffnenbearbeitenToolStripMenuItem
//
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Name = "versandCouvertÖffnenbearbeitenToolStripMenuItem";
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(312, 24);
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(261, 22);
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten";
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click);
//
@@ -1156,6 +1168,8 @@
this.ribbonPanel1.ButtonMoreEnabled = false;
this.ribbonPanel1.ButtonMoreVisible = false;
this.ribbonPanel1.Items.Add(this.ribbonButtonNewCouvert);
this.ribbonPanel1.Items.Add(this.ribbonSeparator2);
this.ribbonPanel1.Items.Add(this.ribbonAddPDF);
this.ribbonPanel1.Items.Add(this.ribbonSeparator1);
this.ribbonPanel1.Items.Add(this.ribbonButtonDokPreview);
this.ribbonPanel1.Items.Add(this.ribbonchkadresse);
@@ -1171,6 +1185,19 @@
this.ribbonButtonNewCouvert.Text = "Neues Couvert";
this.ribbonButtonNewCouvert.Click += new System.EventHandler(this.ribbonButtonNewCouvert_Click);
//
// ribbonSeparator2
//
this.ribbonSeparator2.Name = "ribbonSeparator2";
//
// ribbonAddPDF
//
this.ribbonAddPDF.Image = global::OnDoc.Properties.Resources.PDF_32x32_32;
this.ribbonAddPDF.LargeImage = global::OnDoc.Properties.Resources.PDF_32x32_32;
this.ribbonAddPDF.Name = "ribbonAddPDF";
this.ribbonAddPDF.SmallImage = global::OnDoc.Properties.Resources.PDF_24x24_32;
this.ribbonAddPDF.Text = "Externes PDF hinzufügen";
this.ribbonAddPDF.Click += new System.EventHandler(this.ribbonAddPDF_Click);
//
// ribbonSeparator1
//
this.ribbonSeparator1.Name = "ribbonSeparator1";
@@ -1203,6 +1230,7 @@
//
this.ribbonPanel2.ButtonMoreVisible = false;
this.ribbonPanel2.Items.Add(this.ribbonbuttondokpreviewpostkorb);
this.ribbonPanel2.Items.Add(this.ribbonbtnAktualisieren);
this.ribbonPanel2.Name = "ribbonPanel2";
this.ribbonPanel2.Text = "";
//
@@ -1243,7 +1271,7 @@
this.lblprieveiwbezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblprieveiwbezeichnung.Location = new System.Drawing.Point(7, 16);
this.lblprieveiwbezeichnung.Name = "lblprieveiwbezeichnung";
this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 25);
this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20);
this.lblprieveiwbezeichnung.TabIndex = 0;
//
// panel2
@@ -1259,6 +1287,7 @@
// panel3
//
this.panel3.BackColor = System.Drawing.Color.LightGray;
this.panel3.Controls.Add(this.lblAttachment);
this.panel3.Controls.Add(this.richTextBox1);
this.panel3.Controls.Add(this.lblerror);
this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -1267,6 +1296,17 @@
this.panel3.Size = new System.Drawing.Size(462, 138);
this.panel3.TabIndex = 8;
//
// lblAttachment
//
this.lblAttachment.AutoSize = true;
this.lblAttachment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAttachment.Location = new System.Drawing.Point(4, 122);
this.lblAttachment.Name = "lblAttachment";
this.lblAttachment.Size = new System.Drawing.Size(446, 17);
this.lblAttachment.TabIndex = 2;
this.lblAttachment.Text = "Hinweis: Externe Dateien werden nicht ins Onbase archiviert";
this.lblAttachment.Visible = false;
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.LightGray;
@@ -1274,7 +1314,7 @@
this.richTextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.richTextBox1.Location = new System.Drawing.Point(3, 0);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(453, 132);
this.richTextBox1.Size = new System.Drawing.Size(453, 111);
this.richTextBox1.TabIndex = 1;
this.richTextBox1.Text = "";
//
@@ -1283,7 +1323,7 @@
this.lblerror.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblerror.Location = new System.Drawing.Point(0, 3);
this.lblerror.Name = "lblerror";
this.lblerror.Size = new System.Drawing.Size(396, 130);
this.lblerror.Size = new System.Drawing.Size(396, 108);
this.lblerror.TabIndex = 0;
//
// pnlpostkorb
@@ -1301,7 +1341,7 @@
this.lblpostausgang.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblpostausgang.Location = new System.Drawing.Point(1238, 49);
this.lblpostausgang.Name = "lblpostausgang";
this.lblpostausgang.Size = new System.Drawing.Size(166, 25);
this.lblpostausgang.Size = new System.Drawing.Size(135, 20);
this.lblpostausgang.TabIndex = 24;
this.lblpostausgang.Text = "labelpostausgang";
this.lblpostausgang.Visible = false;
@@ -1326,7 +1366,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 22);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(163, 15);
this.label1.Size = new System.Drawing.Size(143, 13);
this.label1.TabIndex = 21;
this.label1.Text = "Fortschritt Dokumentversand";
//
@@ -1360,7 +1400,7 @@
this.lblProgressTitel.AutoSize = true;
this.lblProgressTitel.Location = new System.Drawing.Point(12, 9);
this.lblProgressTitel.Name = "lblProgressTitel";
this.lblProgressTitel.Size = new System.Drawing.Size(0, 15);
this.lblProgressTitel.Size = new System.Drawing.Size(0, 13);
this.lblProgressTitel.TabIndex = 19;
//
// label3
@@ -1368,7 +1408,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(435, 78);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(28, 15);
this.label3.Size = new System.Drawing.Size(25, 13);
this.label3.TabIndex = 18;
this.label3.Text = "100";
//
@@ -1377,7 +1417,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 78);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(14, 15);
this.label2.Size = new System.Drawing.Size(13, 13);
this.label2.TabIndex = 17;
this.label2.Text = "0";
//
@@ -1402,11 +1442,24 @@
this.lblserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblserienbrief.Location = new System.Drawing.Point(1236, 48);
this.lblserienbrief.Name = "lblserienbrief";
this.lblserienbrief.Size = new System.Drawing.Size(125, 25);
this.lblserienbrief.Size = new System.Drawing.Size(101, 20);
this.lblserienbrief.TabIndex = 26;
this.lblserienbrief.Text = "lblSerienbrief";
this.lblserienbrief.Visible = false;
//
// openFileDialog1
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// ribbonbtnAktualisieren
//
this.ribbonbtnAktualisieren.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonbtnAktualisieren.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.ribbonbtnAktualisieren.Name = "ribbonbtnAktualisieren";
this.ribbonbtnAktualisieren.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32;
this.ribbonbtnAktualisieren.Text = "Aktualisieren";
this.ribbonbtnAktualisieren.Click += new System.EventHandler(this.ribbonbtnAktualisieren_Click);
//
// Versandstrasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1455,6 +1508,7 @@
this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
this.pnlpostkorb.ResumeLayout(false);
this.pnlprogress.ResumeLayout(false);
this.pnlprogress.PerformLayout();
@@ -1561,5 +1615,11 @@
private System.Windows.Forms.Panel pnlcouvertgroesse;
private System.Windows.Forms.RadioButton rbc5normal;
private System.Windows.Forms.RadioButton rbc5mini;
private System.Windows.Forms.ToolStripMenuItem externesPDFHinzufügenToolStripMenuItem;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private System.Windows.Forms.RibbonButton ribbonAddPDF;
private System.Windows.Forms.RibbonSeparator ribbonSeparator2;
private System.Windows.Forms.Label lblAttachment;
private System.Windows.Forms.RibbonButton ribbonbtnAktualisieren;
}
}

302
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -295,8 +295,9 @@ namespace OnDoc.Versandstrasse
private bool Verify_Couvert(TreeNodeAdv node)
{
errors.Clear();
bool hastattachment = false;
errormessage = "";
errors.Clear();
lblerror.Visible = false;
Versandpaket vp = node.TagObject as Versandpaket;
if (vp.isSerienbrief)
@@ -381,6 +382,17 @@ namespace OnDoc.Versandstrasse
foreach (TreeNodeAdv dokumentnode in node.Nodes)
{
if (dokumentnode.Tag.ToString().Contains("ATT"))
{
hastattachment = true;
if (nodecounter == 0)
{
versandbereit = false;
add_errormessage(11, "Ein externes Dokument kann nicht als erstes Dokument im Couvert sein");
break;
}
else { versandbereit = true; break; }
}
//node.LeftImageIndices = new int[] { 0 };
db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc, isnull(postzustellung,0) as postzustellung FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
@@ -450,9 +462,13 @@ namespace OnDoc.Versandstrasse
}
if (node.Nodes.Count < 1) { versandbereit = false; add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
if (anzbp > 1) { versandbereit = false; }
if (hastattachment) { lblAttachment.Visible = true; } else { lblAttachment.Visible = false; }
if (versandbereit == true)
{
richTextBox1.Clear();
richTextBox1.SelectionBullet = false;
lblerror.Visible = false;
lblerror.Text = "";
set_nodeimage(node, 1);
return true;
}
@@ -507,25 +523,33 @@ namespace OnDoc.Versandstrasse
dokumentnode.Text = paket.Dokument[i].Bezeichnung + " (" + paket.Dokument[i].Partnernr + ")";
dokumentnode.Tag = paket.Dokument[i].DokumentID;
dokumentnode.TagObject = paket.Dokument[i];
reserve_vs_dokument(dokumentnode.Tag.ToString(), 3);
db.Get_Tabledata("SELECT dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
// Attachment
if (dokumentnode.Tag.ToString().Contains("ATT"))
{
set_nodeimage(dokumentnode, 5);
}
else
{
set_nodeimage(dokumentnode, 3);
}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
}
else
{
//dokumentnode.LeftImageIndices = new int[] { 3};
reserve_vs_dokument(dokumentnode.Tag.ToString(), 3);
db.Get_Tabledata("SELECT dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
{
set_nodeimage(dokumentnode, 5);
}
else
{
set_nodeimage(dokumentnode, 3);
}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
}
else
{
//dokumentnode.LeftImageIndices = new int[] { 3};
}
}
parentnode.Nodes.Add(dokumentnode);
@@ -536,6 +560,45 @@ namespace OnDoc.Versandstrasse
#region "Treeview"
private void treeViewAdv1_DragDrop(object sender, DragEventArgs e)
{
try
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
{
TreeViewAdv FiletreeView = sender as TreeViewAdv;
TreeNodeAdv FilesourceNode = (TreeNodeAdv)e.Data.GetData(typeof(TreeNodeAdv));
TreeNodeAdv FiledestinationNode = this.treeViewDragHighlightTracker.HighlightNode;
TreeViewDropPositions FiledropPosition = this.treeViewDragHighlightTracker.DropPosition;
Point ptInTree = FiletreeView.PointToClient(new Point(e.X, e.Y));
FiledestinationNode = FiletreeView.GetNodeAtPoint(ptInTree);
if (FiledestinationNode == null) { FiledestinationNode=treeViewAdv1.Nodes[0]; }
Versandpaket DestPaket;
if (FiledestinationNode.Level == 1)
{
DestPaket = FiledestinationNode.TagObject as Versandpaket;
}
else
{
DestPaket = FiledestinationNode.Parent.TagObject as Versandpaket;
}
int partnernr = DestPaket.partnernr;
string[] files = e.Data.GetData(DataFormats.FileDrop) as string[]; // get all files droppeds
foreach (string file in files)
{
if (System.IO.Path.GetExtension(file.ToUpper()) == ".PDF")
{
Add_Attachment(file, partnernr,DestPaket.PaketNr);
}
else
{
}
}
return;
}
}
catch { e.Effect = DragDropEffects.None;return; }
try
{
TreeViewAdv treeView = sender as TreeViewAdv;
@@ -599,6 +662,38 @@ namespace OnDoc.Versandstrasse
private void treeViewAdv1_DragOver(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
{
bool Filedroppable = true;
TreeNodeAdv FiledestinationNode = null;
TreeViewAdv FiletreeView = sender as TreeViewAdv;
Point FileptInTree = FiletreeView.PointToClient(new Point(e.X, e.Y));
FiledestinationNode = FiletreeView.GetNodeAtPoint(FileptInTree);
try
{
if (FiledestinationNode.Nodes.Count == 0)
{
e.Effect = DragDropEffects.None;
return;
}
string[] files = e.Data.GetData(DataFormats.FileDrop) as string[]; // get all files droppeds
foreach (string file in files)
{
if (System.IO.Path.GetExtension(file.ToUpper()) == ".PDF")
{
e.Effect = DragDropEffects.Link;
}
else
{
e.Effect = DragDropEffects.None;
return;
}
}
return;
}
catch { }
}
bool droppable = true;
TreeNodeAdv destinationNode = null;
TreeViewAdv treeView = sender as TreeViewAdv;
@@ -606,9 +701,28 @@ namespace OnDoc.Versandstrasse
this.currentSourceNode = null;
if (e.Data.GetDataPresent(typeof(TreeNodeAdv)))
{
destinationNode = treeView.GetNodeAtPoint(ptInTree);
TreeNodeAdv sourceNode = (TreeNodeAdv)e.Data.GetData(typeof(TreeNodeAdv));
this.currentSourceNode = sourceNode;
try
{
Versanddokument vd = sourceNode.TagObject as Versanddokument;
if (vd.DokumentID.Contains("ATT"))
{
TreeNodeAdv destnodetop = destinationNode;
if (destnodetop.Level > 1) { destnodetop = destnodetop.Parent; }
if (destnodetop != sourceNode.Parent)
{
e.Effect = DragDropEffects.None;
droppable = false;
return;
}
}
}
catch { }
droppable = this.CanDrop(sourceNode, destinationNode);
//if (droppable == true) { if (destinationNode.Tag.ToString() != "Druckpaket") { droppable = false; } }
}
@@ -777,11 +891,18 @@ namespace OnDoc.Versandstrasse
{
foreach (Versanddokument vsdok in paket.Dokument)
{
if (vsdok.DokumentID == tn.Tag.ToString())
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
if (vsdok.DokumentID.Contains("ATT") && vsdok.dokument != "")
{
}
else
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
}
}
}
}
@@ -817,7 +938,14 @@ namespace OnDoc.Versandstrasse
//}
string stapel = save_stapel(ref streams);
if (stapel == "File too large")
{
MessageBox.Show("Das Versandpaket ist zu gross. Es können max. "+ String.Format("{0:0.0}", AppParams.MaxFileSize/(1024*1024)) + " MB versendet werden.","Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Error);
panelPrepare.Visible = false;
Cursor = Cursors.Default;
return;
}
paket.finaldoc = stapel;
@@ -840,7 +968,7 @@ namespace OnDoc.Versandstrasse
if (Properties.Settings.Default.GASSize == "True")
{
if (Convert.ToInt32(txtAnzahlSeiten.Text) > 30)
{
if (chkGAS.Checked && rbc5mini.Checked)
{
@@ -872,8 +1000,14 @@ namespace OnDoc.Versandstrasse
MemoryStream outputStream = new MemoryStream();
finalDoc.Save(outputStream);
var size = outputStream.ToArray().Length;
byte[] bytes;
bytes = outputStream.ToArray();
if (size > AppParams.MaxFileSize)
{
return "File too large";
}
return Convert.ToBase64String(bytes);
}
catch { return ""; }
@@ -980,8 +1114,15 @@ namespace OnDoc.Versandstrasse
List<Versanddokument> vdl = new List<Versanddokument>();
if (Properties.Settings.Default.GASSize == "True")
{
if (rbc5mini.Checked) { vp.GASSize = "C5mini"; }
if (rbc5normal.Checked) { vp.GASSize = "C5normal"; }
if (chkGAS.Checked)
{
if (rbc5mini.Checked) { vp.GASSize = "C5mini"; }
if (rbc5normal.Checked) { vp.GASSize = "C5normal"; }
}
else
{
vp.GASSize = "";
}
}
else
{
@@ -1249,7 +1390,16 @@ namespace OnDoc.Versandstrasse
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, null, "", this.ribbonchkadresse.Checked);
Versanddokument vd = node.TagObject as Versanddokument;
if (vd.DokumentID.Contains("ATT") && vd.dokument != "")
{
dok = vd.dokument;
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, null, "", this.ribbonchkadresse.Checked);
}
}
var stream = new MemoryStream(Convert.FromBase64String(dok));
@@ -1600,12 +1750,12 @@ namespace OnDoc.Versandstrasse
int a = 0;
}
public void add_doc(Versanddokument vs)
public void add_doc(Versanddokument vs, string paketnr="")
{
bool zugewiesen = false;
foreach (Versandpaket vp in pakete)
{
if (vp.partnernr.ToString() == vs.Partnernr)
if (vp.partnernr.ToString() == vs.Partnernr && (paketnr=="" || paketnr==vp.PaketNr))
{
vp.Dokument.Add(vs);
zugewiesen = true;
@@ -1648,5 +1798,111 @@ namespace OnDoc.Versandstrasse
{
this.panelVerify.Visible = false;
}
private void externesPDFHinzufügenToolStripMenuItem_Click(object sender, EventArgs e)
{
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level != 1)
{
node = node.Parent;
}
if (node.Nodes.Count < 1)
{
MessageBox.Show("Bitte zuerst ein reguläres OnDoc-Dokument zum Paket hinzufügen, "+Environment.NewLine+"bevor ein Anhang zugefügt wird.", "PDF-Datei hinzufügen", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
Versandpaket vp = node.TagObject as Versandpaket;
int partnernr = vp.partnernr;
Random random = new Random(19);
openFileDialog1.FileName = "";
openFileDialog1.Filter = "PDF-Dokumente (*.pdf)|*.pdf|Alle Dokumente (*.*)|*.*";
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
if (System.IO.Path.GetExtension(openFileDialog1.FileName).ToLower() != ".pdf")
{
MessageBox.Show("Es können lediglich PDF-Dateien hinzugefügt werden.","PDF-Datei hinzufügen",MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
Add_Attachment(openFileDialog1.FileName, partnernr,vp.PaketNr);
}
}
private void Add_Attachment(string filename,int partnernr, string paketnr)
{
Helper.FileHelper fh = new Helper.FileHelper();
string att = fh.Base64FromFile(filename);
clsVersandstrasse vs = new clsVersandstrasse();
att = vs.check_pdf_pages(att);
string gid = "ATT" + RandomString(19);
vs = null;
Versanddokument attachment = new Versanddokument(gid, "Externe Datei: " + filename, partnernr.ToString());
attachment.dokument = att;
add_doc(attachment,paketnr );
}
public string RandomString(int size, bool lowerCase = false)
{
var builder = new StringBuilder(size);
// Unicode/ASCII Letters are divided into two blocks
// (Letters 65–90 / 97–122):
// The first group containing the uppercase letters and
// the second group containing the lowercase.
// char is a single Unicode character
char offset = lowerCase ? 'a' : 'A';
const int lettersOffset = 26; // A...Z or a..z: length=26
for (var i = 0; i < size; i++)
{
var @char = (char)_random.Next(offset, offset + lettersOffset);
builder.Append(@char);
}
return lowerCase ? builder.ToString().ToLower() : builder.ToString();
}
private readonly Random _random = new Random();
// Generates a random number within a range.
public int RandomNumber(int min, int max)
{
return _random.Next(min, max);
}
private void ribbonAddPDF_Click(object sender, EventArgs e)
{
externesPDFHinzufügenToolStripMenuItem_Click(sender, e);
}
private void contextMenuStrip2_Opening(object sender, CancelEventArgs e)
{
int id = Convert.ToInt32(treeViewAdvCouverts.SelectedNode.Tag);
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select versendet, aktiv from Ondoc_Versandstrasse_Paket where id = " + id.ToString(), false, true);
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][0]) == true)
{
MessageBox.Show("Das Paket wurde zwischenzeitlich versendet. Bitte die Ansicht aktualisieren.", "Versandcouvert", MessageBoxButtons.OK, MessageBoxIcon.Information);
e.Cancel = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]) == false)
{
MessageBox.Show("Das Paket wurde zwischenzeitlich gelöscht. Bitte die Ansicht aktualisieren.", "Versandcouvert", MessageBoxButtons.OK, MessageBoxIcon.Information);
e.Cancel = true;
}
}
catch { }
finally { db = null; }
}
private void ribbonbtnAktualisieren_Click(object sender, EventArgs e)
{
Refresh_VersandCouverts();
}
}
}

9
Client/Versandstrasse/Versandstrasse.resx
View File

@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAAUgBAQFIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBQEAAVABAQFQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -355,7 +355,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
CQAAAk1TRnQBSQFMAgEBAwEAAfABAAHwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAwEAARABAQEQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -415,6 +415,9 @@
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>763, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAUAAAAAAAEAIABcjwAAVgAAADAwAAABACAAqCUAALKPAAAgIAAAAQAgAKgQAABatQAAGBgAAAEA