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

Update 20250117 12:30

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-17 12:37:03 +01:00
parent 3e36dd541b
commit cfd7c00451
147 changed files with 89099 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Client/Diverses/MitarbeiterProfil.Designer.cs generated
View File

@@ -73,6 +73,7 @@
this.lblVorname = new System.Windows.Forms.Label();
this.txtName = new System.Windows.Forms.TextBox();
this.lblName = new System.Windows.Forms.Label();
this.chkOndocMails = new System.Windows.Forms.CheckBox();
this.GrpBoxProfile.SuspendLayout();
this.GrpBoxDetails.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
@@ -331,6 +332,7 @@
//
// GrpBoxMitarbeiter
//
this.GrpBoxMitarbeiter.Controls.Add(this.chkOndocMails);
this.GrpBoxMitarbeiter.Controls.Add(this.button1);
this.GrpBoxMitarbeiter.Controls.Add(this.btnLoadImage);
this.GrpBoxMitarbeiter.Controls.Add(this.label12);
@@ -518,6 +520,16 @@
this.lblName.TabIndex = 0;
this.lblName.Text = "Name";
//
// chkOndocMails
//
this.chkOndocMails.AutoSize = true;
this.chkOndocMails.Location = new System.Drawing.Point(29, 257);
this.chkOndocMails.Name = "chkOndocMails";
this.chkOndocMails.Size = new System.Drawing.Size(128, 17);
this.chkOndocMails.TabIndex = 19;
this.chkOndocMails.Text = "OnDoc-Mails erhalten";
this.chkOndocMails.UseVisualStyleBackColor = true;
//
// MitarbeiterProfil
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -595,5 +607,6 @@
private System.Windows.Forms.Label label12;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.CheckBox chkOndocMails;
}
}

4
Client/Diverses/MitarbeiterProfil.cs
View File

@@ -216,6 +216,7 @@ namespace OnDoc.Diverses
txtfax.Text = db.dsdaten.Tables[0].Rows[0]["fax"].ToString();
txtunterschrift.Text = db.dsdaten.Tables[0].Rows[0]["unterschrift_text"].ToString();
txtfunktion.Text = db.dsdaten.Tables[0].Rows[0]["funktion"].ToString();
chkOndocMails.Checked = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["mailempfang"]) == true;
db = null;
// System.Drawing.Image image = System.Drawing.Image.FromFile(@"E:\Software-Projekte\OnDoc\Images\download.png");
//this.pictureBox1.Image = image;
@@ -320,6 +321,9 @@ namespace OnDoc.Diverses
db.Exec_SQL("Update mitarbeiter set name='" + txtName.Text + "', vorname='" + txtVorname.Text + "', email='" + txtmail.Text + "', telefon='" + txttelefon.Text + "' where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString());
db.Exec_SQL("Update mitarbeiter set fax='" + txtfax.Text + "', unterschrift_text='" + txtunterschrift.Text + "', funktion='" + txtfunktion.Text + "', mutiert_am=getdate(), mutierer=" + AppParams.CurrentMitarbeiter.ToString() + " where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString());
int mailempfang = 0;
if (chkOndocMails.Checked) { mailempfang = 1; }
db.Exec_SQL("Update mitarbeiter set mailempfang=" + mailempfang.ToString() + " where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString());
db = null;
}
}

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(168, 26);
this.label2.TabIndex = 2;
this.label2.Text = "13. Januar 2025";
this.label2.Text = "16. Januar 2025";
//
// SplashScreen
//

35
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -116,15 +116,20 @@ namespace OnDoc.DocMgmt
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from edex_dokumentpaket where dokumentpaketnr="+dokumentpaketnr.ToString(), false, true);
dokumentpaket = db.dsdaten.Tables[0].Copy();
string sql = "SELECT dbo.edex_dokumentpaket.dokumentpaketnr, dbo.edex_dokumentpaket.bezeichnung, dbo.dokumenttyp.dokumenttypnr, ";
sql = sql + "dbo.dokumenttyp.bezeichnung AS dokumenttypbezeichnung, dbo.edex_dokumentpaketvorlage.zwingend, ";
sql = sql + "dbo.edex_dokumentpaketvorlage.sort FROM dbo.edex_dokumentpaket INNER JOIN dbo.edex_dokumentpaketvorlage ON ";
sql = sql + "dbo.edex_dokumentpaket.dokumentpaketnr = dbo.edex_dokumentpaketvorlage.dokumentpaketnr INNER JOIN dbo.dokumenttyp ON ";
sql = sql + "dbo.edex_dokumentpaketvorlage.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr ";
sql = sql + " WHERE edex_dokumentpaket.dokumentpaketnr="+dokumentpaketnr.ToString()+" and (dbo.edex_dokumentpaket.aktiv = 1) AND ";
sql = sql + " dbo.edex_dokumentpaketvorlage.aktiv = 1 ORDER BY dbo.edex_dokumentpaketvorlage.sort";
db.Get_Tabledata(sql,false,true);
dokumentpaketvorlagen=db.dsdaten.Tables[0].Copy();
db.clear_parameter();
db.add_parameter("@dpnr", dokumentpaketnr.ToString());
string sql = "sp_ondoc_dpdetails";
db.Get_Tabledata(sql,true,false);
//string sql = "SELECT dbo.edex_dokumentpaket.dokumentpaketnr, dbo.edex_dokumentpaket.bezeichnung, dbo.dokumenttyp.dokumenttypnr, ";
//sql = sql + "dbo.dokumenttyp.bezeichnung AS dokumenttypbezeichnung, dbo.edex_dokumentpaketvorlage.zwingend, ";
//sql = sql + "dbo.edex_dokumentpaketvorlage.sort FROM dbo.edex_dokumentpaket INNER JOIN dbo.edex_dokumentpaketvorlage ON ";
//sql = sql + "dbo.edex_dokumentpaket.dokumentpaketnr = dbo.edex_dokumentpaketvorlage.dokumentpaketnr INNER JOIN dbo.dokumenttyp ON ";
//sql = sql + "dbo.edex_dokumentpaketvorlage.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr ";
//sql = sql + " WHERE edex_dokumentpaket.dokumentpaketnr="+dokumentpaketnr.ToString()+" and (dbo.edex_dokumentpaket.aktiv = 1) AND ";
//sql = sql + " dbo.edex_dokumentpaketvorlage.aktiv = 1 ORDER BY dbo.edex_dokumentpaketvorlage.sort";
//db.Get_Tabledata(sql,false,true);
dokumentpaketvorlagen = db.dsdaten.Tables[0].Copy();
dokumentpaketvorlagen_Original = db.dsdaten.Tables[0].Copy();
sfListView1.DataSource = dokumentpaketvorlagen;
sfListView1.DisplayMember = "dokumenttypbezeichnung";
@@ -267,12 +272,12 @@ namespace OnDoc.DocMgmt
{
if (Convert.ToInt32(r[2]) == vorlagenr)
{
if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
{
MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
dataRow[4] = 1;
return;
}
//if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
//{
// MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
// dataRow[4] = 1;
// return;
//}
}
}
if (Convert.ToInt32(dataRow[4]) == 1)

222
Client/DocMgmt/Serienbrief.Designer.cs generated
View File

@@ -41,16 +41,19 @@
this.rbbpb = new System.Windows.Forms.RadioButton();
this.rbppa = new System.Windows.Forms.RadioButton();
this.rbppohne = new System.Windows.Forms.RadioButton();
this.grpDruckstapel = new System.Windows.Forms.GroupBox();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.treeviewDruckstapel = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.pnlprogress = new System.Windows.Forms.Panel();
this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv();
this.lblProgressTitel = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.grpDruckstapel = new System.Windows.Forms.GroupBox();
this.panel2 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.treeviewDruckstapel = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
@@ -127,10 +130,11 @@
this.label4 = new System.Windows.Forms.Label();
this.GrpDokumentInhalt.SuspendLayout();
this.grpFaktura.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
this.pnlprogress.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
this.grpDruckstapel.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
this.groupBox8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).BeginInit();
this.groupBox7.SuspendLayout();
@@ -160,8 +164,8 @@
// GrpDokumentInhalt
//
this.GrpDokumentInhalt.Controls.Add(this.grpFaktura);
this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
this.GrpDokumentInhalt.Controls.Add(this.pnlprogress);
this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
this.GrpDokumentInhalt.Controls.Add(this.groupBox8);
this.GrpDokumentInhalt.Controls.Add(this.groupBox7);
this.GrpDokumentInhalt.Controls.Add(this.groupBox6);
@@ -219,85 +223,6 @@
this.rbppohne.Text = "Keine";
this.rbppohne.UseVisualStyleBackColor = true;
//
// grpDruckstapel
//
this.grpDruckstapel.Controls.Add(this.button2);
this.grpDruckstapel.Controls.Add(this.button1);
this.grpDruckstapel.Controls.Add(this.treeviewDruckstapel);
this.grpDruckstapel.Location = new System.Drawing.Point(1086, 23);
this.grpDruckstapel.Name = "grpDruckstapel";
this.grpDruckstapel.Size = new System.Drawing.Size(477, 210);
this.grpDruckstapel.TabIndex = 19;
this.grpDruckstapel.TabStop = false;
this.grpDruckstapel.Text = "Druckstapel";
this.grpDruckstapel.Visible = false;
//
// button2
//
this.button2.Location = new System.Drawing.Point(396, 184);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 20;
this.button2.Text = "Schliessen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button1
//
this.button1.Location = new System.Drawing.Point(240, 15);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(169, 23);
this.button1.TabIndex = 19;
this.button1.Text = "öffnen zum Drucken";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// treeviewDruckstapel
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeviewDruckstapel.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeviewDruckstapel.BeforeTouchSize = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.Dock = System.Windows.Forms.DockStyle.Left;
//
//
//
this.treeviewDruckstapel.HelpTextControl.BaseThemeName = null;
this.treeviewDruckstapel.HelpTextControl.Location = new System.Drawing.Point(0, 0);
this.treeviewDruckstapel.HelpTextControl.Name = "";
this.treeviewDruckstapel.HelpTextControl.Size = new System.Drawing.Size(392, 112);
this.treeviewDruckstapel.HelpTextControl.TabIndex = 0;
this.treeviewDruckstapel.HelpTextControl.Visible = true;
this.treeviewDruckstapel.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.treeviewDruckstapel.Location = new System.Drawing.Point(3, 16);
this.treeviewDruckstapel.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeviewDruckstapel.Name = "treeviewDruckstapel";
this.treeviewDruckstapel.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeviewDruckstapel.Size = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.TabIndex = 18;
this.treeviewDruckstapel.Text = "treeViewAdv2";
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 1;
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
//
//
//
this.treeviewDruckstapel.ToolTipControl.BaseThemeName = null;
this.treeviewDruckstapel.ToolTipControl.Location = new System.Drawing.Point(0, 0);
this.treeviewDruckstapel.ToolTipControl.Name = "";
this.treeviewDruckstapel.ToolTipControl.Size = new System.Drawing.Size(392, 112);
this.treeviewDruckstapel.ToolTipControl.TabIndex = 0;
this.treeviewDruckstapel.ToolTipControl.Visible = true;
//
// pnlprogress
//
this.pnlprogress.BackColor = System.Drawing.Color.Gainsboro;
@@ -370,6 +295,114 @@
this.progressBar1.Size = new System.Drawing.Size(448, 23);
this.progressBar1.TabIndex = 16;
//
// grpDruckstapel
//
this.grpDruckstapel.Controls.Add(this.panel2);
this.grpDruckstapel.Controls.Add(this.button2);
this.grpDruckstapel.Controls.Add(this.button1);
this.grpDruckstapel.Controls.Add(this.treeviewDruckstapel);
this.grpDruckstapel.Location = new System.Drawing.Point(1141, 9);
this.grpDruckstapel.Name = "grpDruckstapel";
this.grpDruckstapel.Size = new System.Drawing.Size(477, 210);
this.grpDruckstapel.TabIndex = 19;
this.grpDruckstapel.TabStop = false;
this.grpDruckstapel.Text = "Druckstapel";
this.grpDruckstapel.Visible = false;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.MistyRose;
this.panel2.Controls.Add(this.label6);
this.panel2.Controls.Add(this.label5);
this.panel2.Location = new System.Drawing.Point(232, 70);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(239, 59);
this.panel2.TabIndex = 21;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(4, 26);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(224, 13);
this.label6.TabIndex = 1;
this.label6.Text = "Druckereinstellungen Ein-/Doppelseitig prüfen";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(4, 7);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(183, 13);
this.label5.TabIndex = 0;
this.label5.Text = "Der Druck erfolgt vie Acrobat Reader";
//
// button2
//
this.button2.Location = new System.Drawing.Point(396, 184);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 20;
this.button2.Text = "Schliessen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button1
//
this.button1.Location = new System.Drawing.Point(232, 16);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(169, 23);
this.button1.TabIndex = 19;
this.button1.Text = "öffnen zum Drucken";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// treeviewDruckstapel
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeviewDruckstapel.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeviewDruckstapel.BeforeTouchSize = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.Dock = System.Windows.Forms.DockStyle.Left;
//
//
//
this.treeviewDruckstapel.HelpTextControl.BaseThemeName = null;
this.treeviewDruckstapel.HelpTextControl.Location = new System.Drawing.Point(0, 0);
this.treeviewDruckstapel.HelpTextControl.Name = "";
this.treeviewDruckstapel.HelpTextControl.Size = new System.Drawing.Size(392, 112);
this.treeviewDruckstapel.HelpTextControl.TabIndex = 0;
this.treeviewDruckstapel.HelpTextControl.Visible = true;
this.treeviewDruckstapel.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.treeviewDruckstapel.Location = new System.Drawing.Point(3, 16);
this.treeviewDruckstapel.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeviewDruckstapel.Name = "treeviewDruckstapel";
this.treeviewDruckstapel.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeviewDruckstapel.Size = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.TabIndex = 18;
this.treeviewDruckstapel.Text = "treeViewAdv2";
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 1;
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.treeviewDruckstapel.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
//
//
//
this.treeviewDruckstapel.ToolTipControl.BaseThemeName = null;
this.treeviewDruckstapel.ToolTipControl.Location = new System.Drawing.Point(0, 0);
this.treeviewDruckstapel.ToolTipControl.Name = "";
this.treeviewDruckstapel.ToolTipControl.Size = new System.Drawing.Size(392, 112);
this.treeviewDruckstapel.ToolTipControl.TabIndex = 0;
this.treeviewDruckstapel.ToolTipControl.Visible = true;
//
// groupBox8
//
this.groupBox8.Controls.Add(this.cbboxteam);
@@ -416,6 +449,8 @@
this.cbformularohneunterschrfit.TabIndex = 11;
this.cbformularohneunterschrfit.Text = "Formular ohne Unterschrift";
this.cbformularohneunterschrfit.UseVisualStyleBackColor = true;
this.cbformularohneunterschrfit.CheckedChanged += new System.EventHandler(this.cbformularohneunterschrfit_CheckedChanged);
this.cbformularohneunterschrfit.Click += new System.EventHandler(this.cbformularohneunterschrfit_Click);
//
// cbdigitaleunterschrfiten
//
@@ -426,6 +461,7 @@
this.cbdigitaleunterschrfiten.TabIndex = 10;
this.cbdigitaleunterschrfiten.Text = "Faksimile Signatur";
this.cbdigitaleunterschrfiten.UseVisualStyleBackColor = true;
this.cbdigitaleunterschrfiten.CheckedChanged += new System.EventHandler(this.cbdigitaleunterschrfiten_CheckedChanged);
//
// cbboxunterschriftrechts
//
@@ -647,6 +683,7 @@
// sfDataGridEmpfaenger
//
this.sfDataGridEmpfaenger.AccessibleName = "Table";
this.sfDataGridEmpfaenger.AllowFiltering = true;
this.sfDataGridEmpfaenger.AllowResizingColumns = true;
this.sfDataGridEmpfaenger.ContextMenuStrip = this.ctxmenuEmpfaenger;
this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1038,7 +1075,7 @@
this.ribbonButtonPartnerPruefen.LargeImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_32x32_32;
this.ribbonButtonPartnerPruefen.Name = "ribbonButtonPartnerPruefen";
this.ribbonButtonPartnerPruefen.SmallImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_24x24_32;
this.ribbonButtonPartnerPruefen.Text = "Partnerlise_prüfen";
this.ribbonButtonPartnerPruefen.Text = "Partnerliste_prüfen";
this.ribbonButtonPartnerPruefen.Click += new System.EventHandler(this.ribbonButton2_Click);
//
// ribbonPanel8
@@ -1189,7 +1226,7 @@
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(463, 97);
this.panelLoad.Location = new System.Drawing.Point(488, 46);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;
@@ -1225,11 +1262,13 @@
this.GrpDokumentInhalt.ResumeLayout(false);
this.grpFaktura.ResumeLayout(false);
this.grpFaktura.PerformLayout();
this.grpDruckstapel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
this.pnlprogress.ResumeLayout(false);
this.pnlprogress.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
this.grpDruckstapel.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
this.groupBox8.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).EndInit();
this.groupBox7.ResumeLayout(false);
@@ -1353,5 +1392,8 @@
private System.Windows.Forms.ToolStripMenuItem archivierenUndAbschliessenToolStripMenuItem;
private System.Windows.Forms.RibbonButton ribbonbuttonloadtemplate;
private System.Windows.Forms.RibbonButton ribbonbuttonsavetemplate;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
}
}

101
Client/DocMgmt/Serienbrief.cs
View File

@@ -98,12 +98,20 @@ namespace OnDoc.UIControls
private bool IsPreview = false;
private string PreviewFiename = "";
private int broadcasterdone = 0;
public void OnListen(string message, SenderInfo sender)
{
if (message == "BtnSBVorschau")
{
if (sender.SenderName == "Serienbriefbearbeitung")
{
if (broadcasterdone == 1)
{
broadcasterdone = 0;
return;
}
broadcasterdone = 1;
string[] details = sender.Function.Split(' ');
foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
{
@@ -367,6 +375,7 @@ namespace OnDoc.UIControls
if (!found) { sb.dsempfaenger.Tables[0].Columns.Add("IntEintragnr"); }
int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
int saldmessage = 0;
sfDataGridEmpfaenger.DataSource = null;
foreach (System.Data.DataRow dr in importdata.Rows)
{
@@ -398,20 +407,42 @@ namespace OnDoc.UIControls
// r1["inteingragnr"] = string.Empty;
//}
//catch { }
dB.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + r1[0].ToString(), false, true);
dB.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + r1[0].ToString(), false, true);
try
{
if (dB.dsdaten.Tables[0].Rows.Count > 0)
{
if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
//if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else
r1["fehlercode"] = 0;
string kurzbez = dB.dsdaten.Tables[0].Rows[0][0].ToString();
if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0][1]) == true)
{
saldmessage = 1;
kurzbez = "SALDIERT: " + kurzbez;
}
//r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
r1[1] = kurzbez;
sb.dsempfaenger.Tables[0].Rows.Add(r1);
}
else
{
r1["Fehlercode"] = 1;
r1[1] = "Parnter nicht vorhanden";
sb.dsempfaenger.Tables[0].Rows.Add(r1);
}
}
catch { }
}
dB = null;
Partnerliste_Pruefen();
if (saldmessage > 0)
{
MessageBox.Show("Die Partnerliste enthält saldierte Kunden-Einträge", "Partnerprüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
Partnerliste_Pruefen();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
finish_progress();
@@ -500,6 +531,7 @@ namespace OnDoc.UIControls
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(-1);
//this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
@@ -654,11 +686,16 @@ namespace OnDoc.UIControls
sb.aktiv = true;
sb.mutiert_am = DateTime.Now;
sb.mutierer = AppParams.CurrentMitarbeiter;
sb.verantwortlich = AppParams.CurrentMitarbeiter;
if (rbzustaendigkube.Checked) { sb.zustaendig = -1; } else { sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue); }
//sb.verantwortlich = AppParams.CurrentMitarbeiter;
if (rbzustaendigkube.Checked) { sb.zustaendig = -1; } else {
sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
}
//sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; }
try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; }
try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; }
try
{
if (cbdigitaleunterschrfiten.Checked)
@@ -875,6 +912,7 @@ namespace OnDoc.UIControls
cbboxunterschriftlinks.SelectedValue = sb.unterschriftlinks;
cbboxunterschriftrechts.SelectedValue = sb.unterschriftrechts;
cbboxverantwortlich.SelectedValue = sb.verantwortlich;
DateDokumentDatum.Value = sb.archivdatum;
switch (sb.ppfaktura)
{
@@ -891,6 +929,7 @@ namespace OnDoc.UIControls
rbzustaendigkube.Checked = false;
rbzustaendigmitarbeiter.Checked = true;
cbboxzustaendigmitarbeiter.SelectedValue = sb.zustaendig;
if (sb.zustaendig == 0) { cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter; }
}
update_zahlen();
GrpDokumentInhalt.Enabled = true;
@@ -1152,7 +1191,7 @@ namespace OnDoc.UIControls
if (!Partnerliste_Pruefen()) { return; }
Generate();
}
private void Generate(int vorschauid = 0)
private void Generate(int vorschauid = -1)
{
@@ -1191,6 +1230,9 @@ namespace OnDoc.UIControls
{
sb.img_faktura = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(imghelper.get_image(2, -1, 0));
}
if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; };
imghelper = null;
@@ -1202,13 +1244,13 @@ namespace OnDoc.UIControls
}
private void vorlagendaten_aufbereiten(int vorschauid = 0)
private void vorlagendaten_aufbereiten(int vorschauid = -1)
{
init_progressbar("Dokumente generieren", vorlagendaten.Rows.Count);
for (int i = 0, loopTo = vorlagendaten.Rows.Count - 1; i <= loopTo; i++)
{
if (vorschauid == 0 || Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
if (vorschauid == -1 || Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
{
add_progress();
System.Windows.Forms.Application.DoEvents();
@@ -1430,7 +1472,7 @@ namespace OnDoc.UIControls
if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); }
string filename = dokumentid + ".pdf";
if (vorschauid != 0 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
if (vorschauid != -1 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
{
string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
sbedit.Update_Preview(pdfdoc_preview);
@@ -1444,7 +1486,7 @@ namespace OnDoc.UIControls
System.IO.File.Delete(AppParams.tempdir + filename);
}
db = null;
if (dr != null && vorschauid == 0)
if (dr != null && vorschauid == -1)
{
dr["STATUS"] = "1";
dr["Dokumentid"] = dokumentid;
@@ -2069,5 +2111,42 @@ namespace OnDoc.UIControls
}
}
private void cbformularohneunterschrfit_Click(object sender, EventArgs e)
{
}
private void cbformularohneunterschrfit_CheckedChanged(object sender, EventArgs e)
{
if (cbformularohneunterschrfit.Checked)
{
cbboxunterschriftlinks.SelectedValue = -1;
cbboxunterschriftrechts.SelectedValue = -1;
cbboxunterschriftrechts.Enabled = false;
cbboxunterschriftlinks.Enabled = false;
cbdigitaleunterschrfiten.Checked = false;
cbdigitaleunterschrfiten.Enabled = false;
}
else {
cbboxunterschriftrechts.Enabled = true;
cbboxunterschriftlinks.Enabled = true;
cbdigitaleunterschrfiten.Enabled = true;
}
}
private void cbdigitaleunterschrfiten_CheckedChanged(object sender, EventArgs e)
{
if (cbdigitaleunterschrfiten.Checked)
{
cbboxunterschriftlinks.Enabled = true;
cbboxunterschriftrechts.Enabled = true;
cbformularohneunterschrfit.Checked = false;
cbformularohneunterschrfit.Enabled = false;
}
else
{
cbformularohneunterschrfit.Enabled = true;
}
}
}
}

6
Client/DocMgmt/SerienbriefBearbeitung.cs
View File

@@ -25,6 +25,7 @@ using Windows.UI.Xaml.Controls;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using System.Threading;
namespace OnDoc.DocMgmt
{
@@ -133,6 +134,10 @@ namespace OnDoc.DocMgmt
{
tscomboboxbp.Items.Add(dr[0].ToString() + " " + dr[1].ToString());
}
if (tscomboboxbp.Items.Count > 0)
{
tscomboboxbp.SelectedIndex = 0;
}
format_standardgrid();
@@ -176,6 +181,7 @@ namespace OnDoc.DocMgmt
word = new Microsoft.Office.Interop.Word.Application();
doc = new Microsoft.Office.Interop.Word.Document();
word.Documents.Open(sb.filename);
Thread.Sleep(1000);
doc = word.ActiveDocument;
word.Visible = word_visible;
word.WindowState = Microsoft.Office.Interop.Word.WdWindowState.wdWindowStateMaximize;

8
Client/DocMgmt/frmToApproval.Designer.cs generated
View File

@@ -74,18 +74,18 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(29, 31);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(151, 13);
this.label2.Size = new System.Drawing.Size(148, 13);
this.label2.TabIndex = 14;
this.label2.Text = "Unterschfrift links prüfen durch";
this.label2.Text = "Unterschrift links prüfen durch";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(29, 62);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(159, 13);
this.label3.Size = new System.Drawing.Size(156, 13);
this.label3.TabIndex = 15;
this.label3.Text = "Unterschfrift rechts prüfen durch";
this.label3.Text = "Unterschrift rechts prüfen durch";
//
// label4
//

8
Client/DocMgmt/frmToApproval.resx
View File

@@ -121,7 +121,7 @@
<data name="pxapproval1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -401,7 +401,7 @@
<data name="pxapproval1.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -681,7 +681,7 @@
<data name="pxapproval2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -961,7 +961,7 @@
<data name="pxapproval2.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj

4
Client/Klassen/EDKFile.cs
View File

@@ -139,7 +139,7 @@ namespace OnDoc.Klassen
if (dokwerte.Count > 0)
{
for (int i = 0; i < dokwerte.Count - 1; i++)
for (int i = 0; i < dokwerte.Count ; i++)
{
XmlNodeList XNode = dokwerte[i].ChildNodes;
string value;
@@ -191,7 +191,7 @@ namespace OnDoc.Klassen
public static string GetAVQ_Parameter(string name)
{
for (int i = 0; i < parameters.Count; i++)
for (int i = 0; i < parameters.Count+1; i++)
{
if (parameters[i].name.ToUpper() == name.ToUpper())
{

11
Client/Klassen/clsPartner.cs
View File

@@ -33,6 +33,7 @@ namespace OnDoc.Klassen
db.add_parameter("@anz", anzahl.ToString());
db.add_parameter("@fnkt", fnkt.ToString());
partnerliste = db.Get_Tabledata("sp_partner_search", true, false);
if (partnerliste.Rows.Count < 1) { return partnerliste; }
string selectstring = "";
if (saldiert == false)
@@ -41,11 +42,11 @@ namespace OnDoc.Klassen
}
if (!personendokument && !bpdokument)
{
DataRow[] rowsToKeep = partnerliste.Select(selectstring);
DataTable tempDataTable = rowsToKeep.CopyToDataTable();
partnerliste.Clear();
partnerliste.Merge(tempDataTable);
tempDataTable.Dispose();
DataRow[] rowsToKeep = partnerliste.Select(selectstring);
DataTable tempDataTable = rowsToKeep.CopyToDataTable();
partnerliste.Clear();
partnerliste.Merge(tempDataTable);
tempDataTable.Dispose();
} else { selectstring = selectstring + " and "; }
if (personendokument)

2
Client/Program.cs
View File

@@ -62,6 +62,7 @@ namespace OnDoc
}
string destfile = AppParams.tempdir + DateTime.Now.ToString("yyyyMMddHHmmss") + "_tmpfile.edk";
System.IO.File.Copy(args[0],destfile);
//System.IO.File.Delete(args[0]);
//EDK_Data.Load_EDK_File(args[0]);
}
@@ -114,6 +115,7 @@ namespace OnDoc
// Application.Run(MyForm);
Application.Run(new Start());
//Application.Run(new Dummy());

3
Client/Start.cs
View File

@@ -107,7 +107,7 @@ namespace OnDoc
dokList1.load_Profile();
dokList1.refresh_dokumente();
dokList1.set_functions();
Logging.Logging.Debug("Start - Ende", "start.cs", "");
@@ -139,6 +139,7 @@ namespace OnDoc
timer1.Start();
}
private void Start_Load(object sender, EventArgs e)
{
//if (ExternalCall.sourceparam.Trim().ToString() !="" && ExternalCall.executed == false)

36
Client/UIControls/DocPreview.cs
View File

@@ -57,24 +57,28 @@ namespace OnDoc.UIControls
}
public void Show_Doc(string dokumentid)
{
PrintDokID= dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
//clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
if (stream.Length > 0)
try
{
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
}
else
{
PrintDokID = dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
//clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
if (stream.Length > 0)
{
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
}
else
{
}
}
catch { }
}
public void show_base64(string image,string Logtext)

18
Client/UIControls/DokList.cs
View File

@@ -979,6 +979,24 @@ namespace OnDoc.UICintrols
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
}
if (e.Column.MappingName == "Erstellt am")
{
var f = e.Column.Format;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
e.DisplayText = dataRow["Erstellt am"].ToString();
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "Mutiert am")
{
var f = e.Column.Format;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
e.DisplayText = dataRow["Mutiert am"].ToString();
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
if (e.Column.MappingName == "fileext")
{
try

25
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -58,6 +58,7 @@
this.GrpTeam = new System.Windows.Forms.GroupBox();
this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox();
this.GrpUnterschrift = new System.Windows.Forms.GroupBox();
this.lblohneUnterschrift = new System.Windows.Forms.Label();
this.cbformularohneunterschrfit = new System.Windows.Forms.CheckBox();
this.cbfaksimile = new System.Windows.Forms.CheckBox();
this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -79,7 +80,6 @@
this.lblPostzustellung = new System.Windows.Forms.Label();
this.btnErneutGenerierung = new System.Windows.Forms.Button();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.lblohneUnterschrift = new System.Windows.Forms.Label();
this.GrpPartner.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
@@ -307,9 +307,10 @@
this.gridDokwertlist.Size = new System.Drawing.Size(456, 376);
this.gridDokwertlist.TabIndex = 0;
this.gridDokwertlist.Text = "sfDataGrid1";
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick);
this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
this.gridDokwertlist.CurrentCellEndEdit += new Syncfusion.WinForms.DataGrid.Events.CurrentCellEndEditEventHandler(this.gridDokwertlist_CurrentCellEndEdit);
this.gridDokwertlist.DoubleClick += new System.EventHandler(this.gridDokwertlist_DoubleClick);
//
// lblBezeichnung
//
@@ -424,6 +425,16 @@
this.GrpUnterschrift.TabStop = false;
this.GrpUnterschrift.Text = "Unterschriften";
//
// lblohneUnterschrift
//
this.lblohneUnterschrift.AutoSize = true;
this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
this.lblohneUnterschrift.Name = "lblohneUnterschrift";
this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
this.lblohneUnterschrift.TabIndex = 12;
this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
this.lblohneUnterschrift.Visible = false;
//
// cbformularohneunterschrfit
//
this.cbformularohneunterschrfit.AutoSize = true;
@@ -648,16 +659,6 @@
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// lblohneUnterschrift
//
this.lblohneUnterschrift.AutoSize = true;
this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
this.lblohneUnterschrift.Name = "lblohneUnterschrift";
this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
this.lblohneUnterschrift.TabIndex = 12;
this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
this.lblohneUnterschrift.Visible = false;
//
// UCAllgemeineDokumentParam
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

61
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -37,6 +37,8 @@ namespace OnDoc.UIControls
public bool interop { get; set; } = false;
public bool barcode { get; set; } = false;
public bool bedingt_retournierbar { get; set; } = false;
public bool runmacros { get; set; } = false;
public string check_error { get; set; } = "";
@@ -175,8 +177,15 @@ namespace OnDoc.UIControls
catch { interop = false; }
barcode = Convert.ToBoolean(dr["Vertrag"])== true;
barcode = Convert.ToBoolean(dr["zu_retournieren"]) == true;
if (Convert.ToInt32(dr["doktypbedingteretournierung"]) > 0)
{
barcode = true;
}
try
{
this.bedingt_retournierbar = Convert.ToBoolean(dr["bedingtretournierbar"]) == true;
}
catch { }
try
{
if (dr["physisches_archiv"].ToString() == "1") { this.barcode_zusatz = " U"; }
@@ -571,6 +580,7 @@ namespace OnDoc.UIControls
try { docgendata.unterschriftRehts = cbboxunterschriftrechts.SelectedValue.ToString(); } catch { docgendata.unterschriftRehts = ""; }
if (cbfaksimile.Checked) { docgendata.digitaleunterschrift = true; } else { docgendata.digitaleunterschrift = false; }
if (cbformularohneunterschrfit.Checked) { docgendata.frormularOhneUnterschrift = true; } else { docgendata.frormularOhneUnterschrift = false; }
if (lblohneUnterschrift.Visible) { docgendata.frormularOhneUnterschrift = true; }
docgendata.verantwortlich = cbboxverantwortlich.SelectedValue.ToString();
docgendata.team = cbboxteam.SelectedValue.ToString();
@@ -644,6 +654,7 @@ namespace OnDoc.UIControls
dokdata.Erstellung_in_Office = this.Erstellung_in_Office;
dokdata.FillOffice = this.FillOffice;
dokdata.CompatibilityMode= this.CompatibilityMode;
if (dokdata.Barcode==false && this.bedingt_retournierbar==true) { dokdata.Barcode = true; }
if (DateTerminText.Text == "")
{
@@ -685,18 +696,22 @@ namespace OnDoc.UIControls
private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
if (e.DataColumn.ColumnIndex!=15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
try
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
//if (e.DataColumn.ColumnIndex != 15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
}
}
catch { }
}
private string data_select(string datenherkunft, string feldtyp)
@@ -890,5 +905,31 @@ namespace OnDoc.UIControls
{
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
}
private void gridDokwertlist_DoubleClick(object sender, EventArgs e)
{
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
try
{
if (e.DataColumn.ColumnIndex != 15) { return; }
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
gridDokwertlist.Refresh();
}
}
catch { }
}
}
}

BIN
Client/bin/Debug/BarcodeLib.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/BarcodeLib.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Model.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Model.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

9
Client/bin/Debug/bck/Herma_4611.frx
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="09/23/2024 14:02:41" ReportInfo.Modified="09/23/2024 14:49:37" ReportInfo.CreatorVersion="2024.1.0.0">
<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="09/23/2024 14:02:41" ReportInfo.Modified="01/14/2025 19:30:14" ReportInfo.CreatorVersion="2024.1.0.0">
<Dictionary>
<TableDataSource Name="Barcodes" ReferenceName="Data.Barcodes" DataType="System.Int32" Enabled="true">
<Column Name="barcode" DataType="System.String"/>
<Column Name="barcodetext" DataType="System.String"/>
</TableDataSource>
</Dictionary>
<ReportPage Name="Page1" PaperWidth="210.0072" PaperHeight="297.0022" LeftMargin="0" TopMargin="4.826" RightMargin="0" BottomMargin="0" Columns.Count="3" Columns.Width="70.104" Columns.Positions="0,70.104,140.208" Watermark.Font="Arial, 60pt" Duplex="Simplex">
<DataBand Name="Data1" Width="264.99" Height="64.26" DataSource="Barcodes">
<BarcodeObject Name="Barcode1" Left="56.7" Top="9.45" Width="141.17" Height="28.35" AutoSize="false" Text="[Barcodes.barcode]" ShowText="false" AllowExpressions="true" Barcode="2/5 Interleaved"/>
<TextObject Name="Text1" Left="56.7" Top="37.8" Width="141.75" Height="18.9" Text="[Barcodes.barcode]" HorzAlign="Center" Font="Arial, 10pt"/>
<DataBand Name="Data1" Width="264.99" Height="66.15" DataSource="Barcodes">
<TextObject Name="Text2" Left="28.35" Top="9.45" Width="198.45" Height="37.8" Text="[Barcodes.barcode]" HorzAlign="Center" Font="Bar 25i d, 26pt"/>
<TextObject Name="Text3" Left="37.8" Top="37.8" Width="189" Height="18.9" Text="[Barcodes.barcodetext]" HorzAlign="Center" Font="Arial, 11pt"/>
</DataBand>
</ReportPage>
</Report>

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.