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

update 20251228

Browse Source
This commit is contained in:
Stefan Hutter
2025-12-28 09:56:40 +01:00
parent 4239fba5aa
commit e377f08ccd
46 changed files with 933 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@
this.tsbtncopy = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.GrpUnterschrifte = new System.Windows.Forms.GroupBox();
this.cbfaksimileStandard = new System.Windows.Forms.CheckBox();
this.lblStandard = new System.Windows.Forms.Label();
this.lbUnterschriftStandard = new System.Windows.Forms.ListBox();
this.cbUnterschriftrechts = new System.Windows.Forms.CheckBox();
@@ -154,7 +155,7 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.cbfaksimileStandard = new System.Windows.Forms.CheckBox();
this.cbSignierungSyncfusion = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -238,7 +239,7 @@
this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(8, 51);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(31, 15);
this.label20.Size = new System.Drawing.Size(28, 13);
this.label20.TabIndex = 3;
this.label20.Text = "Bes.";
//
@@ -262,7 +263,7 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(7, 21);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(31, 15);
this.label19.Size = new System.Drawing.Size(29, 13);
this.label19.TabIndex = 0;
this.label19.Text = "URI:";
//
@@ -283,7 +284,7 @@
this.chkversandstrassefirstdok.AutoSize = true;
this.chkversandstrassefirstdok.Location = new System.Drawing.Point(163, 20);
this.chkversandstrassefirstdok.Name = "chkversandstrassefirstdok";
this.chkversandstrassefirstdok.Size = new System.Drawing.Size(188, 19);
this.chkversandstrassefirstdok.Size = new System.Drawing.Size(162, 17);
this.chkversandstrassefirstdok.TabIndex = 2;
this.chkversandstrassefirstdok.Text = "Als erstes Dokument möglich";
this.chkversandstrassefirstdok.UseVisualStyleBackColor = true;
@@ -293,7 +294,7 @@
this.cbebanking_moeglich.AutoSize = true;
this.cbebanking_moeglich.Location = new System.Drawing.Point(19, 43);
this.cbebanking_moeglich.Name = "cbebanking_moeglich";
this.cbebanking_moeglich.Size = new System.Drawing.Size(152, 19);
this.cbebanking_moeglich.Size = new System.Drawing.Size(131, 17);
this.cbebanking_moeglich.TabIndex = 1;
this.cbebanking_moeglich.Text = "E-Banking zugelassen";
this.cbebanking_moeglich.UseVisualStyleBackColor = true;
@@ -303,7 +304,7 @@
this.cbversandstrasse_moeglich.AutoSize = true;
this.cbversandstrasse_moeglich.Location = new System.Drawing.Point(19, 20);
this.cbversandstrasse_moeglich.Name = "cbversandstrasse_moeglich";
this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(92, 19);
this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(79, 17);
this.cbversandstrasse_moeglich.TabIndex = 0;
this.cbversandstrasse_moeglich.Text = "zugelassen";
this.cbversandstrasse_moeglich.UseVisualStyleBackColor = true;
@@ -339,7 +340,7 @@
this.tsbtncopy.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.tsbtncopy.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtncopy.Name = "tsbtncopy";
this.tsbtncopy.Size = new System.Drawing.Size(29, 39);
this.tsbtncopy.Size = new System.Drawing.Size(24, 39);
this.tsbtncopy.Text = "Dokumenttyp kopieren";
this.tsbtncopy.Click += new System.EventHandler(this.tsbtncopy_Click);
//
@@ -349,12 +350,13 @@
this.toolStripButton3.Image = global::OnDoc.Properties.Resources.officevorlage_16x16_32;
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(29, 39);
this.toolStripButton3.Size = new System.Drawing.Size(24, 39);
this.toolStripButton3.Text = "Vorlage anzeigen";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// GrpUnterschrifte
//
this.GrpUnterschrifte.Controls.Add(this.cbSignierungSyncfusion);
this.GrpUnterschrifte.Controls.Add(this.cbfaksimileStandard);
this.GrpUnterschrifte.Controls.Add(this.lblStandard);
this.GrpUnterschrifte.Controls.Add(this.lbUnterschriftStandard);
@@ -369,12 +371,20 @@
this.GrpUnterschrifte.TabStop = false;
this.GrpUnterschrifte.Text = "Unterschriften";
//
// cbfaksimileStandard
//
this.cbfaksimileStandard.Location = new System.Drawing.Point(163, 49);
this.cbfaksimileStandard.Name = "cbfaksimileStandard";
this.cbfaksimileStandard.Size = new System.Drawing.Size(216, 24);
this.cbfaksimileStandard.TabIndex = 27;
this.cbfaksimileStandard.Text = "Faksimile Standard";
//
// lblStandard
//
this.lblStandard.AutoSize = true;
this.lblStandard.Location = new System.Drawing.Point(336, 28);
this.lblStandard.Name = "lblStandard";
this.lblStandard.Size = new System.Drawing.Size(57, 15);
this.lblStandard.Size = new System.Drawing.Size(50, 13);
this.lblStandard.TabIndex = 26;
this.lblStandard.Text = "Standard";
this.lblStandard.Visible = false;
@@ -440,7 +450,7 @@
this.cbUnterschriftpruefung.AutoSize = true;
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19);
this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung";
this.cbUnterschriftpruefung.Size = new System.Drawing.Size(203, 19);
this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17);
this.cbUnterschriftpruefung.TabIndex = 1;
this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend";
this.cbUnterschriftpruefung.UseVisualStyleBackColor = true;
@@ -450,7 +460,7 @@
this.chkBewilliigungZwingend.AutoSize = true;
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19);
this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend";
this.chkBewilliigungZwingend.Size = new System.Drawing.Size(209, 19);
this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17);
this.chkBewilliigungZwingend.TabIndex = 0;
this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend";
this.chkBewilliigungZwingend.UseVisualStyleBackColor = true;
@@ -480,7 +490,7 @@
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(277, 13);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(126, 15);
this.label18.Size = new System.Drawing.Size(105, 13);
this.label18.TabIndex = 29;
this.label18.Text = "Kompatibilitätsmodus";
//
@@ -489,7 +499,7 @@
this.chkfilloffice.AutoSize = true;
this.chkfilloffice.Location = new System.Drawing.Point(277, 63);
this.chkfilloffice.Name = "chkfilloffice";
this.chkfilloffice.Size = new System.Drawing.Size(135, 19);
this.chkfilloffice.Size = new System.Drawing.Size(117, 17);
this.chkfilloffice.TabIndex = 28;
this.chkfilloffice.Text = "Befüllung mit Office";
this.chkfilloffice.UseVisualStyleBackColor = true;
@@ -751,7 +761,7 @@
this.rbDokumenterstellungPerson.AutoSize = true;
this.rbDokumenterstellungPerson.Location = new System.Drawing.Point(293, 32);
this.rbDokumenterstellungPerson.Name = "rbDokumenterstellungPerson";
this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(181, 19);
this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(155, 17);
this.rbDokumenterstellungPerson.TabIndex = 22;
this.rbDokumenterstellungPerson.Text = "Dokumenterstellung Person";
this.rbDokumenterstellungPerson.UseVisualStyleBackColor = true;
@@ -762,7 +772,7 @@
this.rbDokumenterstellungBP.Checked = true;
this.rbDokumenterstellungBP.Location = new System.Drawing.Point(293, 13);
this.rbDokumenterstellungBP.Name = "rbDokumenterstellungBP";
this.rbDokumenterstellungBP.Size = new System.Drawing.Size(158, 19);
this.rbDokumenterstellungBP.Size = new System.Drawing.Size(136, 17);
this.rbDokumenterstellungBP.TabIndex = 21;
this.rbDokumenterstellungBP.TabStop = true;
this.rbDokumenterstellungBP.Text = "Dokumenterstellung BP";
@@ -1107,7 +1117,7 @@
this.chkaktiv.AutoSize = true;
this.chkaktiv.Location = new System.Drawing.Point(135, 576);
this.chkaktiv.Name = "chkaktiv";
this.chkaktiv.Size = new System.Drawing.Size(18, 17);
this.chkaktiv.Size = new System.Drawing.Size(15, 14);
this.chkaktiv.TabIndex = 35;
this.chkaktiv.Tag = "aktiv";
this.chkaktiv.UseVisualStyleBackColor = true;
@@ -1118,7 +1128,7 @@
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 577);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(31, 15);
this.label14.Size = new System.Drawing.Size(31, 13);
this.label14.TabIndex = 34;
this.label14.Text = "Aktiv";
//
@@ -1146,7 +1156,7 @@
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(18, 230);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(110, 15);
this.label13.Size = new System.Drawing.Size(97, 13);
this.label13.TabIndex = 31;
this.label13.Text = "Tech-Bezeichnung";
//
@@ -1164,7 +1174,7 @@
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(18, 204);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(102, 15);
this.label12.Size = new System.Drawing.Size(88, 13);
this.label12.TabIndex = 29;
this.label12.Text = "Feldbezeichnung";
//
@@ -1182,7 +1192,7 @@
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(18, 513);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(107, 15);
this.label11.Size = new System.Drawing.Size(92, 13);
this.label11.TabIndex = 27;
this.label11.Text = "ESS-Image height";
//
@@ -1200,7 +1210,7 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(18, 487);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(102, 15);
this.label10.Size = new System.Drawing.Size(88, 13);
this.label10.TabIndex = 25;
this.label10.Text = "ESS-Image width";
//
@@ -1218,7 +1228,7 @@
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(18, 461);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(89, 15);
this.label8.Size = new System.Drawing.Size(77, 13);
this.label8.TabIndex = 23;
this.label8.Text = "ESS-Image left";
//
@@ -1236,7 +1246,7 @@
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(18, 435);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(94, 15);
this.label7.Size = new System.Drawing.Size(82, 13);
this.label7.TabIndex = 21;
this.label7.Text = "ESS-Image Top";
//
@@ -1255,7 +1265,7 @@
this.lblessfieldname.AutoSize = true;
this.lblessfieldname.Location = new System.Drawing.Point(18, 409);
this.lblessfieldname.Name = "lblessfieldname";
this.lblessfieldname.Size = new System.Drawing.Size(91, 15);
this.lblessfieldname.Size = new System.Drawing.Size(77, 13);
this.lblessfieldname.TabIndex = 19;
this.lblessfieldname.Text = "ESS-Feldname";
//
@@ -1273,7 +1283,7 @@
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(18, 383);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(72, 15);
this.label9.Size = new System.Drawing.Size(62, 13);
this.label9.TabIndex = 17;
this.label9.Text = "ESS-Klasse";
//
@@ -1291,7 +1301,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(18, 330);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(95, 15);
this.label6.Size = new System.Drawing.Size(82, 13);
this.label6.TabIndex = 15;
this.label6.Text = "Ende-Texmarke";
//
@@ -1309,7 +1319,7 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(18, 304);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(105, 15);
this.label5.Size = new System.Drawing.Size(90, 13);
this.label5.TabIndex = 13;
this.label5.Text = "Beginn-Texmarke";
//
@@ -1328,7 +1338,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(18, 278);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(63, 15);
this.label4.Size = new System.Drawing.Size(53, 13);
this.label4.TabIndex = 11;
this.label4.Text = "Feldname";
//
@@ -1337,7 +1347,7 @@
this.chkzwingend.AutoSize = true;
this.chkzwingend.Location = new System.Drawing.Point(135, 152);
this.chkzwingend.Name = "chkzwingend";
this.chkzwingend.Size = new System.Drawing.Size(18, 17);
this.chkzwingend.Size = new System.Drawing.Size(15, 14);
this.chkzwingend.TabIndex = 10;
this.chkzwingend.Tag = "Zwingend";
this.chkzwingend.UseVisualStyleBackColor = true;
@@ -1348,7 +1358,7 @@
this.lbelzwingend.AutoSize = true;
this.lbelzwingend.Location = new System.Drawing.Point(18, 153);
this.lbelzwingend.Name = "lbelzwingend";
this.lbelzwingend.Size = new System.Drawing.Size(61, 15);
this.lbelzwingend.Size = new System.Drawing.Size(54, 13);
this.lbelzwingend.TabIndex = 9;
this.lbelzwingend.Text = "Zwingend";
//
@@ -1366,7 +1376,7 @@
this.lblsort.AutoSize = true;
this.lblsort.Location = new System.Drawing.Point(18, 178);
this.lblsort.Name = "lblsort";
this.lblsort.Size = new System.Drawing.Size(129, 15);
this.lblsort.Size = new System.Drawing.Size(111, 13);
this.lblsort.TabIndex = 7;
this.lblsort.Text = "Sortier-Reihenfolge UI";
//
@@ -1376,7 +1386,7 @@
this.chkui.Enabled = false;
this.chkui.Location = new System.Drawing.Point(135, 129);
this.chkui.Name = "chkui";
this.chkui.Size = new System.Drawing.Size(18, 17);
this.chkui.Size = new System.Drawing.Size(15, 14);
this.chkui.TabIndex = 6;
this.chkui.Tag = "UI";
this.chkui.UseVisualStyleBackColor = true;
@@ -1387,7 +1397,7 @@
this.lbluidesc.AutoSize = true;
this.lbluidesc.Location = new System.Drawing.Point(18, 129);
this.lbluidesc.Name = "lbluidesc";
this.lbluidesc.Size = new System.Drawing.Size(19, 15);
this.lbluidesc.Size = new System.Drawing.Size(18, 13);
this.lbluidesc.TabIndex = 5;
this.lbluidesc.Text = "UI";
//
@@ -1396,7 +1406,7 @@
this.lblfeldregelid.AutoSize = true;
this.lblfeldregelid.Location = new System.Drawing.Point(132, 40);
this.lblfeldregelid.Name = "lblfeldregelid";
this.lblfeldregelid.Size = new System.Drawing.Size(59, 15);
this.lblfeldregelid.Size = new System.Drawing.Size(50, 13);
this.lblfeldregelid.TabIndex = 3;
this.lblfeldregelid.Text = "Feldregel";
//
@@ -1405,7 +1415,7 @@
this.lblfeldregeliddesc.AutoSize = true;
this.lblfeldregeliddesc.Location = new System.Drawing.Point(18, 43);
this.lblfeldregeliddesc.Name = "lblfeldregeliddesc";
this.lblfeldregeliddesc.Size = new System.Drawing.Size(59, 15);
this.lblfeldregeliddesc.Size = new System.Drawing.Size(50, 13);
this.lblfeldregeliddesc.TabIndex = 2;
this.lblfeldregeliddesc.Text = "Feldregel";
//
@@ -1414,7 +1424,7 @@
this.lblID.AutoSize = true;
this.lblID.Location = new System.Drawing.Point(132, 17);
this.lblID.Name = "lblID";
this.lblID.Size = new System.Drawing.Size(19, 15);
this.lblID.Size = new System.Drawing.Size(18, 13);
this.lblID.TabIndex = 1;
this.lblID.Text = "ID";
//
@@ -1423,7 +1433,7 @@
this.lbliddesc.AutoSize = true;
this.lbliddesc.Location = new System.Drawing.Point(18, 20);
this.lbliddesc.Name = "lbliddesc";
this.lbliddesc.Size = new System.Drawing.Size(19, 15);
this.lbliddesc.Size = new System.Drawing.Size(18, 13);
this.lbliddesc.TabIndex = 0;
this.lbliddesc.Text = "ID";
//
@@ -1505,7 +1515,7 @@
this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkboxaktive.Location = new System.Drawing.Point(205, 43);
this.chkboxaktive.Name = "chkboxaktive";
this.chkboxaktive.Size = new System.Drawing.Size(60, 19);
this.chkboxaktive.Size = new System.Drawing.Size(55, 17);
this.chkboxaktive.TabIndex = 10;
this.chkboxaktive.Text = "aktive";
this.chkboxaktive.UseVisualStyleBackColor = true;
@@ -1524,7 +1534,7 @@
this.rbBezeichnung.AutoSize = true;
this.rbBezeichnung.Location = new System.Drawing.Point(111, 42);
this.rbBezeichnung.Name = "rbBezeichnung";
this.rbBezeichnung.Size = new System.Drawing.Size(100, 19);
this.rbBezeichnung.Size = new System.Drawing.Size(87, 17);
this.rbBezeichnung.TabIndex = 9;
this.rbBezeichnung.Text = "Bezeichnung";
this.rbBezeichnung.UseVisualStyleBackColor = true;
@@ -1535,7 +1545,7 @@
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(12, 15);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(34, 15);
this.label16.Size = new System.Drawing.Size(29, 13);
this.label16.TabIndex = 5;
this.label16.Text = "Filter";
//
@@ -1545,7 +1555,7 @@
this.rbNr.Checked = true;
this.rbNr.Location = new System.Drawing.Point(69, 42);
this.rbNr.Name = "rbNr";
this.rbNr.Size = new System.Drawing.Size(41, 19);
this.rbNr.Size = new System.Drawing.Size(36, 17);
this.rbNr.TabIndex = 8;
this.rbNr.TabStop = true;
this.rbNr.Text = "Nr";
@@ -1557,17 +1567,17 @@
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(12, 44);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(29, 15);
this.label15.Size = new System.Drawing.Size(26, 13);
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// cbfaksimileStandard
// cbSignierungSyncfusion
//
this.cbfaksimileStandard.Location = new System.Drawing.Point(163, 49);
this.cbfaksimileStandard.Name = "cbfaksimileStandard";
this.cbfaksimileStandard.Size = new System.Drawing.Size(216, 24);
this.cbfaksimileStandard.TabIndex = 27;
this.cbfaksimileStandard.Text = "Faksimile Standard";
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";
//
// Dokumenttyp
//
@@ -1744,5 +1754,6 @@
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox txturibeschreibung;
internal System.Windows.Forms.CheckBox cbfaksimileStandard;
internal System.Windows.Forms.CheckBox cbSignierungSyncfusion;
}
}

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

@@ -135,21 +135,24 @@ namespace OnDoc.UIControls.Administrator
//this.cbboxFachverantwortung.SelectedValue = r["fachverantwortung"].ToString();
txtFachverantwortung.Text = r["fachverantwortung"].ToString();
this.cbboxOwner.SelectedValue = r["owner"].ToString();
this.cbVertrag.Checked = Convert.ToBoolean(r["vertrag"]) == true;
this.cbbezeichnungmutierbar.Checked = Convert.ToBoolean(r["bezeichnungmut"]) == true;
this.cbAnzeigeVorlagenauswahl.Checked = Convert.ToBoolean(r["AnzeigeZurDokumenterstellung"]) == true;
this.rbDokumenterstellungBP.Checked = erstellungstyp == 1;
this.rbDokumenterstellungPerson.Checked = erstellungstyp == 2;
try { this.cbVertrag.Checked = Convert.ToBoolean(r["vertrag"]) == true; } catch { this.cbVertrag.Checked = false; }
try { this.cbbezeichnungmutierbar.Checked = Convert.ToBoolean(r["bezeichnungmut"]) == true; } catch { this.cbbezeichnungmutierbar.Checked = false; }
try { this.cbAnzeigeVorlagenauswahl.Checked = Convert.ToBoolean(r["AnzeigeZurDokumenterstellung"]) == true; } catch { this.cbAnzeigeVorlagenauswahl.Checked = false; }
try { this.rbDokumenterstellungBP.Checked = erstellungstyp == 1; } catch { this.rbDokumenterstellungBP.Checked = false; }
try { this.rbDokumenterstellungPerson.Checked = erstellungstyp == 2; } catch { this.rbDokumenterstellungPerson.Checked= false; }
if (rbDokumenterstellungPerson.Checked == false && rbDokumenterstellungBP.Checked == false)
{
rbDokumenterstellungBP.Checked = true;
}
this.cbUnterschriftlinks.Checked = Convert.ToBoolean(r["unterschrift_links"]) == true;
this.cbUnterschriftrechts.Checked = Convert.ToBoolean(r["unterschrift_rechts"]) == true;
this.cbDigitaleUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_Faksimile"]) == true;
this.cbFormularOhneUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_ohne"]) == true;
this.cbfaksimileStandard.Checked = Convert.ToBoolean(r["Unterschrift_Standard"])== true;
this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true;
try { this.cbUnterschriftlinks.Checked = Convert.ToBoolean(r["unterschrift_links"]) == true; } catch { this.cbUnterschriftlinks.Checked = false; }
try { this.cbUnterschriftrechts.Checked = Convert.ToBoolean(r["unterschrift_rechts"]) == true; } catch { this.cbUnterschriftrechts.Checked = false; }
try { this.cbDigitaleUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_Faksimile"]) == true; } catch { this.cbDigitaleUnterschrift.Checked = false; }
try { this.cbFormularOhneUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_ohne"]) == true; } catch { this.cbFormularOhneUnterschrift.Checked = false; }
try { this.cbfaksimileStandard.Checked = Convert.ToBoolean(r["Unterschrift_Standard"]) == true; } catch { this.cbfaksimileStandard.Checked = false; }
try { this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true; } catch { this.cbUnterschriftpruefung.Checked = false; }
try { this.cbSignierungSyncfusion.Checked = Convert.ToBoolean(r["signsf"]) == true; } catch { this.cbSignierungSyncfusion.Checked = false; }
//this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]);
this.cbboxarchiv.SelectedValue = Convert.ToInt32(r["physisches_archiv"]);
//this.cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitungzwingend"]) == true;
@@ -348,6 +351,7 @@ namespace OnDoc.UIControls.Administrator
r["Unterschrift_Pruefung"] = this.cbUnterschriftpruefung.Checked;
r["unterschrift_standard"] = this.lbUnterschriftStandard.SelectedIndex;
r["unterschrift_standard"] = this.cbfaksimileStandard.Checked;
r["signsf"]=this.cbSignierungSyncfusion.Checked;
r["aktiv"] = this.cbaktiv.Checked;
r["mutierer"] = AppParams.CurrentMitarbeiter;
r["mutiert_am"] = DateTime.Now;

47
Client/UIControls/Approval.Designer.cs generated
View File

@@ -36,6 +36,8 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Approval));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.pnlsignerror = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.pnlMultiThreading = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label();
@@ -72,18 +74,16 @@
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.pnlsignerror = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.pnlsignerror.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.pnlMultiThreading.SuspendLayout();
this.panelsign.SuspendLayout();
this.grpDetails.SuspendLayout();
this.pnlsignerror.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -120,6 +120,26 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Dokumente";
//
// pnlsignerror
//
this.pnlsignerror.Controls.Add(this.label9);
this.pnlsignerror.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlsignerror.Location = new System.Drawing.Point(3, 773);
this.pnlsignerror.Name = "pnlsignerror";
this.pnlsignerror.Size = new System.Drawing.Size(294, 100);
this.pnlsignerror.TabIndex = 5;
this.pnlsignerror.Visible = false;
//
// label9
//
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.ForeColor = System.Drawing.Color.Red;
this.label9.Location = new System.Drawing.Point(4, 4);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(287, 46);
this.label9.TabIndex = 0;
this.label9.Text = "Bei der Signierung ist ein Fehler aufgetreten. Bitte wiederholen";
//
// treeViewAdv1
//
this.treeViewAdv1.AccelerateScrolling = Syncfusion.Windows.Forms.AccelerateScrollingBehavior.Immediate;
@@ -571,25 +591,6 @@
this.ribbonButton1.Text = "Aktualisieren";
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// pnlsignerror
//
this.pnlsignerror.Controls.Add(this.label9);
this.pnlsignerror.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlsignerror.Location = new System.Drawing.Point(3, 773);
this.pnlsignerror.Name = "pnlsignerror";
this.pnlsignerror.Size = new System.Drawing.Size(294, 100);
this.pnlsignerror.TabIndex = 5;
this.pnlsignerror.Visible = false;
//
// label9
//
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.Location = new System.Drawing.Point(4, 4);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(287, 46);
this.label9.TabIndex = 0;
this.label9.Text = "Bei der Signierung ist ein Fehler aufgetreten. Bitte wiederholen";
//
// Approval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -602,6 +603,7 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.pnlsignerror.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit();
this.pnlMultiThreading.ResumeLayout(false);
this.pnlMultiThreading.PerformLayout();
@@ -609,7 +611,6 @@
this.panelsign.PerformLayout();
this.grpDetails.ResumeLayout(false);
this.grpDetails.PerformLayout();
this.pnlsignerror.ResumeLayout(false);
this.ResumeLayout(false);
}

24
Client/UIControls/Approval.cs
View File

@@ -274,7 +274,7 @@ namespace OnDoc.UIControls
public List<string> threaddoks = new List<string>();
int signeddoc = 0;
private void signdoc(TreeNodeAdv tn, ref TreeViewAdv tv)
private void signdoc(TreeNodeAdv tn, ref TreeViewAdv tv, ref Panel ipnlsignerror)
{
int approvaltype = 0;
int error = 0;
@@ -411,6 +411,7 @@ namespace OnDoc.UIControls
tn.Enabled = true;
tn.Height = 16;
tn.TextColor = Color.Red;
}
@@ -443,14 +444,14 @@ namespace OnDoc.UIControls
approval_startet = true;
this.docPreview1.clear_viewer();
//Thread signthread = new Thread(signdoc);
Thread signthread = new Thread(() => signdoc(treeViewAdv1.SelectedNode, ref treeViewAdv1));
Thread signthread = new Thread(() => signdoc(treeViewAdv1.SelectedNode, ref treeViewAdv1, ref pnlsignerror));
treeViewAdv1.SelectedNode.Enabled = false;
treeViewAdv1.SelectedNode.Height = 0;
signthread.Start();
//remove_node();
treeViewAdv1.SelectedNode.Enabled=false;
treeViewAdv1.SelectedNode.Height = 0;
return;
}
@@ -588,6 +589,7 @@ namespace OnDoc.UIControls
public int setcounter()
{
this.label8.Text = threaddoks.Count.ToString();
if (threaddoks.Count > 0)
{
if (this.treeViewAdv1.Nodes.Count == 0) { label7.Text = "Dokument(e) werden signiert - nach Abschluss wird das Fenster geschlossen:"; } else { label7.Text = "Dokument(e) werden signiert:"; }
@@ -609,6 +611,13 @@ namespace OnDoc.UIControls
{
this.pnlsignerror.Visible = false;
try
{
if (treeViewAdv1.SelectedNode.TextColor == Color.Red)
{
this.pnlsignerror.Visible = true;
}
}catch { }
try
{
if (treeViewAdv1.SelectedNode.Level == 1)
{
@@ -621,10 +630,7 @@ namespace OnDoc.UIControls
this.ribbonButtonNotApproved.Enabled = true;
}
if (treeViewAdv1.SelectedNode.TextColor== Color.Red)
{
this.pnlsignerror.Visible = true;
}
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }

73
Client/UIControls/DokList.Designer.cs generated
View File

@@ -233,14 +233,14 @@ namespace OnDoc.UICintrols
this.zumVersandpaketHinzufügenToolStripMenuItem,
this.unterschriftTestsToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(342, 652);
this.ctxMenuDokList.Size = new System.Drawing.Size(284, 652);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
//
this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32;
this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem";
this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen";
this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click);
//
@@ -248,7 +248,7 @@ namespace OnDoc.UICintrols
//
this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem";
this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten";
this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click);
//
@@ -256,41 +256,41 @@ namespace OnDoc.UICintrols
//
this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32;
this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem";
this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen";
this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click);
//
// dokumenteZuAndermKundeUmteilenToolStripMenuItem
//
this.dokumenteZuAndermKundeUmteilenToolStripMenuItem.Name = "dokumenteZuAndermKundeUmteilenToolStripMenuItem";
this.dokumenteZuAndermKundeUmteilenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumenteZuAndermKundeUmteilenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumenteZuAndermKundeUmteilenToolStripMenuItem.Text = "Dokument zu Kunde umteilen";
this.dokumenteZuAndermKundeUmteilenToolStripMenuItem.Click += new System.EventHandler(this.dokumenteZuAndermKundeUmteilenToolStripMenuItem_Click);
//
// dokumentMetaDatenBearbeitenToolStripMenuItem
//
this.dokumentMetaDatenBearbeitenToolStripMenuItem.Name = "dokumentMetaDatenBearbeitenToolStripMenuItem";
this.dokumentMetaDatenBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentMetaDatenBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentMetaDatenBearbeitenToolStripMenuItem.Text = "Dokument-Attribute bearbeiten";
this.dokumentMetaDatenBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentMetaDatenBearbeitenToolStripMenuItem_Click);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(338, 6);
this.toolStripMenuItem2.Size = new System.Drawing.Size(280, 6);
//
// zurUnterschriftenPrüfungToolStripMenuItem
//
this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32;
this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem";
this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung";
this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click);
//
// dokumentUnterzeichnenToolStripMenuItem
//
this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem";
this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentUnterzeichnenToolStripMenuItem.Text = "Dokument unterzeichnen";
this.dokumentUnterzeichnenToolStripMenuItem.Visible = false;
this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click);
@@ -299,7 +299,7 @@ namespace OnDoc.UICintrols
//
this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image")));
this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem";
this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.archivierenToolStripMenuItem.Text = "Archivieren";
this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click);
//
@@ -307,7 +307,7 @@ namespace OnDoc.UICintrols
//
this.dokumentAnVersandstrasseToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Envelope_16x16_32;
this.dokumentAnVersandstrasseToolStripMenuItem.Name = "dokumentAnVersandstrasseToolStripMenuItem";
this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentAnVersandstrasseToolStripMenuItem.Text = "Versandstrasse";
this.dokumentAnVersandstrasseToolStripMenuItem.Visible = false;
this.dokumentAnVersandstrasseToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnVersandstrasseToolStripMenuItem_Click);
@@ -316,7 +316,7 @@ namespace OnDoc.UICintrols
//
this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32;
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Visible = false;
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
@@ -324,13 +324,13 @@ namespace OnDoc.UICintrols
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(338, 6);
this.toolStripMenuItem4.Size = new System.Drawing.Size(280, 6);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
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(341, 26);
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
@@ -338,26 +338,26 @@ namespace OnDoc.UICintrols
//
this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(338, 6);
this.toolStripMenuItem1.Size = new System.Drawing.Size(280, 6);
//
// dokumentLinkPerMailVersendenToolStripMenuItem
//
this.dokumentLinkPerMailVersendenToolStripMenuItem.Name = "dokumentLinkPerMailVersendenToolStripMenuItem";
this.dokumentLinkPerMailVersendenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.dokumentLinkPerMailVersendenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.dokumentLinkPerMailVersendenToolStripMenuItem.Text = "Dokument-Link per Mail versenden";
this.dokumentLinkPerMailVersendenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLinkPerMailVersendenToolStripMenuItem_Click);
//
// barcodeDemoToolStripMenuItem
//
this.barcodeDemoToolStripMenuItem.Name = "barcodeDemoToolStripMenuItem";
this.barcodeDemoToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.barcodeDemoToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.barcodeDemoToolStripMenuItem.Text = "Barcode-Demo";
this.barcodeDemoToolStripMenuItem.Visible = false;
this.barcodeDemoToolStripMenuItem.Click += new System.EventHandler(this.barcodeDemoToolStripMenuItem_Click);
@@ -365,7 +365,7 @@ namespace OnDoc.UICintrols
// vertragPDFDEMOToolStripMenuItem
//
this.vertragPDFDEMOToolStripMenuItem.Name = "vertragPDFDEMOToolStripMenuItem";
this.vertragPDFDEMOToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.vertragPDFDEMOToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.vertragPDFDEMOToolStripMenuItem.Text = "Vertrag_PDF_DEMO";
this.vertragPDFDEMOToolStripMenuItem.Visible = false;
this.vertragPDFDEMOToolStripMenuItem.Click += new System.EventHandler(this.vertragPDFDEMOToolStripMenuItem_Click);
@@ -373,14 +373,14 @@ namespace OnDoc.UICintrols
// zellenwertInZwischenablageKopierenToolStripMenuItem
//
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Name = "zellenwertInZwischenablageKopierenToolStripMenuItem";
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Text = "Zellenwert in Zwischenablage kopieren";
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Click += new System.EventHandler(this.zellenwertInZwischenablageKopierenToolStripMenuItem_Click);
//
// pDFGenerierenToolStripMenuItem
//
this.pDFGenerierenToolStripMenuItem.Name = "pDFGenerierenToolStripMenuItem";
this.pDFGenerierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.pDFGenerierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.pDFGenerierenToolStripMenuItem.Text = "PDF generieren";
this.pDFGenerierenToolStripMenuItem.Visible = false;
this.pDFGenerierenToolStripMenuItem.Click += new System.EventHandler(this.pDFGenerierenToolStripMenuItem_Click);
@@ -388,7 +388,7 @@ namespace OnDoc.UICintrols
// wordInterOPEditToolStripMenuItem
//
this.wordInterOPEditToolStripMenuItem.Name = "wordInterOPEditToolStripMenuItem";
this.wordInterOPEditToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.wordInterOPEditToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.wordInterOPEditToolStripMenuItem.Text = "Word InterOP Edit";
this.wordInterOPEditToolStripMenuItem.Visible = false;
this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click);
@@ -397,40 +397,40 @@ namespace OnDoc.UICintrols
//
this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32;
this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
//
// historyToolStripMenuItem
//
this.historyToolStripMenuItem.Name = "historyToolStripMenuItem";
this.historyToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.historyToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(338, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(280, 6);
//
// gruppenÖffnenToolStripMenuItem
//
this.gruppenÖffnenToolStripMenuItem.Name = "gruppenÖffnenToolStripMenuItem";
this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.gruppenÖffnenToolStripMenuItem.Text = "Alle Gruppen aufklappen";
this.gruppenÖffnenToolStripMenuItem.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem_Click);
//
// gruppenSchliessenToolStripMenuItem
//
this.gruppenSchliessenToolStripMenuItem.Name = "gruppenSchliessenToolStripMenuItem";
this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.gruppenSchliessenToolStripMenuItem.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem_Click);
//
// zumVersandpaketHinzufügenToolStripMenuItem
//
this.zumVersandpaketHinzufügenToolStripMenuItem.Name = "zumVersandpaketHinzufügenToolStripMenuItem";
this.zumVersandpaketHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.zumVersandpaketHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.zumVersandpaketHinzufügenToolStripMenuItem.Text = "Zu einem Couvert hinzufügen";
this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = false;
this.zumVersandpaketHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.zumVersandpaketHinzufügenToolStripMenuItem_Click);
@@ -438,7 +438,7 @@ namespace OnDoc.UICintrols
// unterschriftTestsToolStripMenuItem
//
this.unterschriftTestsToolStripMenuItem.Name = "unterschriftTestsToolStripMenuItem";
this.unterschriftTestsToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
this.unterschriftTestsToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
this.unterschriftTestsToolStripMenuItem.Text = "Unterschrift_Tests";
this.unterschriftTestsToolStripMenuItem.Visible = false;
this.unterschriftTestsToolStripMenuItem.Click += new System.EventHandler(this.unterschriftTestsToolStripMenuItem_Click);
@@ -463,7 +463,7 @@ namespace OnDoc.UICintrols
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(143, 24);
this.toolStripLabel1.Size = new System.Drawing.Size(116, 24);
this.toolStripLabel1.Text = "Dokument-Vorschau";
//
// tsrbvorschau
@@ -474,7 +474,6 @@ namespace OnDoc.UICintrols
"Vorschau rechts",
"Vorschau unten",
"Vorschau oben"});
this.tsrbvorschau.Font = new System.Drawing.Font("Segoe UI", 9F);
this.tsrbvorschau.Items.AddRange(new object[] {
"Keine Vorschau",
"Vorschau unten",
@@ -491,7 +490,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image")));
this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnpreviewno.Name = "tsbtnpreviewno";
this.tsbtnpreviewno.Size = new System.Drawing.Size(29, 24);
this.tsbtnpreviewno.Size = new System.Drawing.Size(24, 24);
this.tsbtnpreviewno.Text = "Keine Vorschau";
//
// tsbtnpreviewbottom
@@ -500,7 +499,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image")));
this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom";
this.tsbtnpreviewbottom.Size = new System.Drawing.Size(29, 24);
this.tsbtnpreviewbottom.Size = new System.Drawing.Size(24, 24);
this.tsbtnpreviewbottom.Text = "Vorschau unten";
//
// tsbtnpreviewright
@@ -509,7 +508,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image")));
this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnpreviewright.Name = "tsbtnpreviewright";
this.tsbtnpreviewright.Size = new System.Drawing.Size(29, 24);
this.tsbtnpreviewright.Size = new System.Drawing.Size(24, 24);
this.tsbtnpreviewright.Text = "Vorschau rechts";
//
// splitContainer1
@@ -1587,19 +1586,19 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem1,
this.gruppenSchliessenToolStripMenuItem1});
this.ctxMenuGroups.Name = "ctxMenuGroups";
this.ctxMenuGroups.Size = new System.Drawing.Size(244, 52);
this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48);
//
// gruppenÖffnenToolStripMenuItem1
//
this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1";
this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(243, 24);
this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen";
this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click);
//
// gruppenSchliessenToolStripMenuItem1
//
this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1";
this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(243, 24);
this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click);
//

3
Client/UIControls/DokList.cs
View File

@@ -841,7 +841,8 @@ namespace OnDoc.UICintrols
if (interop == true)
{
OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid, AppParams.RESTURI, AppParams.apikey);
WordInterOP.Edit_Document(runmacros);
WordInterOP.Edit_Document(runmacros);
WordInterOP = null;
}
else

6
Client/UIControls/DokList.resx
View File

@@ -190,7 +190,7 @@
<data name="tsbtnpreviewno.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -205,7 +205,7 @@
<data name="tsbtnpreviewbottom.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -220,7 +220,7 @@
<data name="tsbtnpreviewright.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM