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

update 20241210

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-10 20:36:02 +01:00
parent 8ade484063
commit 2c42687a40
191 changed files with 71919 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,7 @@
this.GrpBewilligung = new System.Windows.Forms.GroupBox();
this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.chkinterop = new System.Windows.Forms.CheckBox();
this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox();
this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox();
@@ -69,7 +70,6 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.TreeDokumentArt = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.GroupBox2 = new System.Windows.Forms.GroupBox();
this.chkboxInOffice = new System.Windows.Forms.CheckBox();
this.cbaktiv = new System.Windows.Forms.CheckBox();
this.rbDokumenterstellungPerson = new System.Windows.Forms.RadioButton();
this.rbDokumenterstellungBP = new System.Windows.Forms.RadioButton();
@@ -77,6 +77,8 @@
this.cbbezeichnungmutierbar = new System.Windows.Forms.CheckBox();
this.cbVertrag = new System.Windows.Forms.CheckBox();
this.Grp1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxFachverantwortung = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxOwner = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxofficevorlage = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -142,8 +144,6 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.cbboxarchiv = new Syncfusion.WinForms.ListView.SfComboBox();
this.label17 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -156,6 +156,7 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumentArt)).BeginInit();
this.GroupBox2.SuspendLayout();
this.Grp1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).BeginInit();
@@ -172,7 +173,6 @@
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).BeginInit();
this.SuspendLayout();
//
// tabControlAdv1
@@ -284,7 +284,6 @@
//
// GrpUnterschrifte
//
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftpruefung);
this.GrpUnterschrifte.Controls.Add(this.lblStandard);
this.GrpUnterschrifte.Controls.Add(this.lbUnterschriftStandard);
this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftrechts);
@@ -301,7 +300,7 @@
// cbUnterschriftpruefung
//
this.cbUnterschriftpruefung.AutoSize = true;
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 105);
this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19);
this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung";
this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17);
this.cbUnterschriftpruefung.TabIndex = 1;
@@ -363,6 +362,7 @@
//
// GrpBewilligung
//
this.GrpBewilligung.Controls.Add(this.cbUnterschriftpruefung);
this.GrpBewilligung.Controls.Add(this.chkBewilliigungZwingend);
this.GrpBewilligung.Location = new System.Drawing.Point(15, 471);
this.GrpBewilligung.Name = "GrpBewilligung";
@@ -374,12 +374,13 @@
// chkBewilliigungZwingend
//
this.chkBewilliigungZwingend.AutoSize = true;
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(19, 20);
this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19);
this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend";
this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17);
this.chkBewilliigungZwingend.TabIndex = 0;
this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend";
this.chkBewilliigungZwingend.UseVisualStyleBackColor = true;
this.chkBewilliigungZwingend.Visible = false;
//
// groupBox4
//
@@ -397,9 +398,17 @@
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(11, 78);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// chkinterop
//
this.chkinterop.Location = new System.Drawing.Point(259, 59);
this.chkinterop.Location = new System.Drawing.Point(11, 59);
this.chkinterop.Name = "chkinterop";
this.chkinterop.Size = new System.Drawing.Size(127, 24);
this.chkinterop.TabIndex = 11;
@@ -407,7 +416,7 @@
//
// chkbearbeitungdirekt
//
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(259, 40);
this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 40);
this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt";
this.chkbearbeitungdirekt.Size = new System.Drawing.Size(127, 24);
this.chkbearbeitungdirekt.TabIndex = 10;
@@ -415,7 +424,7 @@
//
// cbbearbeitungzwingend
//
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(259, 19);
this.cbbearbeitungzwingend.Location = new System.Drawing.Point(11, 19);
this.cbbearbeitungzwingend.Name = "cbbearbeitungzwingend";
this.cbbearbeitungzwingend.Size = new System.Drawing.Size(221, 24);
this.cbbearbeitungzwingend.TabIndex = 9;
@@ -424,7 +433,7 @@
//
// cbPDFDirekteArchivierung
//
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(16, 59);
this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69);
this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung";
this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24);
this.cbPDFDirekteArchivierung.TabIndex = 8;
@@ -433,19 +442,21 @@
//
// cbPDFDokument
//
this.cbPDFDokument.Location = new System.Drawing.Point(16, 40);
this.cbPDFDokument.Location = new System.Drawing.Point(392, 50);
this.cbPDFDokument.Name = "cbPDFDokument";
this.cbPDFDokument.Size = new System.Drawing.Size(280, 24);
this.cbPDFDokument.TabIndex = 6;
this.cbPDFDokument.Text = "Generierng als PDF";
this.cbPDFDokument.Visible = false;
//
// cbOfficeDokument
//
this.cbOfficeDokument.Location = new System.Drawing.Point(16, 19);
this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29);
this.cbOfficeDokument.Name = "cbOfficeDokument";
this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24);
this.cbOfficeDokument.TabIndex = 4;
this.cbOfficeDokument.Text = "Office-Dokument";
this.cbOfficeDokument.Visible = false;
//
// groupBox3
//
@@ -620,14 +631,6 @@
this.GroupBox2.TabStop = false;
this.GroupBox2.Text = "Diverses";
//
// chkboxInOffice
//
this.chkboxInOffice.Location = new System.Drawing.Point(259, 78);
this.chkboxInOffice.Name = "chkboxInOffice";
this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
this.chkboxInOffice.TabIndex = 26;
this.chkboxInOffice.Text = "Erstellung mit Office";
//
// cbaktiv
//
this.cbaktiv.Location = new System.Drawing.Point(293, 53);
@@ -705,6 +708,26 @@
this.Grp1.TabStop = false;
this.Grp1.Text = "Vorlage";
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// cbboxFachverantwortung
//
this.cbboxFachverantwortung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
@@ -1418,26 +1441,6 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// cbboxarchiv
//
this.cbboxarchiv.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxarchiv.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxarchiv.Location = new System.Drawing.Point(120, 168);
this.cbboxarchiv.Name = "cbboxarchiv";
this.cbboxarchiv.Size = new System.Drawing.Size(336, 25);
this.cbboxarchiv.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxarchiv.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxarchiv.TabIndex = 29;
this.cbboxarchiv.TabStop = false;
//
// label17
//
this.label17.Location = new System.Drawing.Point(16, 172);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(100, 16);
this.label17.TabIndex = 30;
this.label17.Text = "Physisches Archiv";
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1469,6 +1472,7 @@
this.GroupBox2.PerformLayout();
this.Grp1.ResumeLayout(false);
this.Grp1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxFachverantwortung)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxOwner)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxofficevorlage)).EndInit();
@@ -1488,7 +1492,6 @@
((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxarchiv)).EndInit();
this.ResumeLayout(false);
}

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

@@ -149,24 +149,31 @@ namespace OnDoc.UIControls.Administrator
this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true;
this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]);
this.cbboxarchiv.SelectedValue = Convert.ToInt32(r["physisches_archiv"]);
switch (Convert.ToInt32(r["genresultat_type"]))
{
case 1:
cbOfficeDokument.Checked = true;
break;
case 2:
cbPDFDokument.Checked = true;
break;
case 3:
cbPDFDirekteArchivierung.Checked = true;
break;
case 4:
cbbearbeitungzwingend.Checked = true;
break;
default:
cbOfficeDokument.Checked = true;
break;
}
//this.cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitungzwingend"]) == true;
//switch (Convert.ToInt32(r["genresultat_type"]))
//{
// case 1:
// cbOfficeDokument.Checked = true;
// break;
// case 2:
// cbPDFDokument.Checked = true;
// break;
// case 3:
// cbPDFDirekteArchivierung.Checked = true;
// break;
// case 4:
// cbbearbeitungzwingend.Checked = true;
// break;
// default:
// cbOfficeDokument.Checked = true;
// break;
//}
try { chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true; } catch { chkbearbeitungdirekt.Checked = false; }
try { chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true; }catch { chkinterop.Checked = false; }
try { chkboxInOffice.Checked = Convert.ToBoolean(r["erstellungInOffice"]) == true; } catch { chkboxInOffice.Checked = false; };
try { cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitung_zwingend"]) == true; } catch { cbbearbeitungzwingend.Checked = false; }
r["physisches_archiv"] = cbboxarchiv.SelectedValue;
this.cbversandstrasse_moeglich.Checked = r["versandstrasse_moeglich"].ToString() == "True";
this.cbebanking_moeglich.Checked = r["ebanking_moeglich"].ToString() == "True";
@@ -175,23 +182,23 @@ namespace OnDoc.UIControls.Administrator
this.listBox1.DataSource = db.dsdaten.Tables[0];
this.listBox1.DisplayMember = "Bezeichnung";
this.listBox1.ValueMember = "vorlagenfeldregelnr";
try
{
chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
}
catch { chkbearbeitungdirekt.Checked = false; }
try
{
chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
}
catch { chkinterop.Checked = false; }
//try
//{
// chkbearbeitungdirekt.Checked = Convert.ToBoolean(r["BearbeitungDirket"]) == true;
//}
//catch { chkbearbeitungdirekt.Checked = false; }
//try
//{
// chkinterop.Checked = Convert.ToBoolean(r["interop"]) == true;
//}
//catch { chkinterop.Checked = false; }
try
{
chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
}
catch
{ chkboxInOffice.Checked = false; }
//try
//{
// chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
//}
//catch
//{ chkboxInOffice.Checked = false; }
Update_Vorlagenfelder();
}
@@ -340,11 +347,11 @@ namespace OnDoc.UIControls.Administrator
r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true;
r["interop"] = chkinterop.Checked == true;
r["erstellungInOffice"] = chkboxInOffice.Checked == true;
r["[physisches_archiv]"]=cbboxarchiv.SelectedValue;
if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
if (cbbearbeitungzwingend.Checked) { r["genresultat_type"] = 4; }
r["physisches_archiv"]=cbboxarchiv.SelectedValue;
//if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
//if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
//if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }
r["bearbeitung_zwingend"] = this.cbbearbeitungzwingend.Checked == true;

4
Client/UIControls/Administrator/edk_viewer.cs
View File

@@ -59,7 +59,7 @@ namespace OnDoc.UIControls.Administrator
}
else
{
sql = "select top "+numericUpDown1.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = "select top "+numericUpDown1.Value.ToString()+" rowid, tgnummer, insert_timestamp, dbo.binarytobase64(xmldata) from edk_data ";
sql = sql + " where insert_timestamp >= '" + datum + "' ";
if (mitarbeiternr > 0)
@@ -69,7 +69,7 @@ namespace OnDoc.UIControls.Administrator
sql = sql + " where tgnummer='" + db.dsdaten.Tables[0].Rows[0][0].ToString() + "'";
}
}
sql = sql + "order by rowid desc";
sql = sql + " order by rowid desc";
}
db.Get_Tabledata(sql, false, true);

2
Client/UIControls/Approval.cs
View File

@@ -147,7 +147,7 @@ namespace OnDoc.UIControls
}
else
{
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString());
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
if (tp.Nodes.Count < 1)
{

90
Client/UIControls/DocPreview.Designer.cs generated
View File

@@ -35,19 +35,19 @@
this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl();
this.pnlEdit = new System.Windows.Forms.Panel();
this.Open = new System.Windows.Forms.ToolStrip();
this.txtPageNumber = new System.Windows.Forms.ToolStripTextBox();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.zoomComboBox = new System.Windows.Forms.ToolStripComboBox();
this.panel1 = new System.Windows.Forms.Panel();
this.btnFirst = new System.Windows.Forms.ToolStripButton();
this.btnPrevious = new System.Windows.Forms.ToolStripButton();
this.txtPageNumber = new System.Windows.Forms.ToolStripTextBox();
this.btnNext = new System.Windows.Forms.ToolStripButton();
this.btnLast = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.zoomIn = new System.Windows.Forms.ToolStripButton();
this.zoomOut = new System.Windows.Forms.ToolStripButton();
this.zoomComboBox = new System.Windows.Forms.ToolStripComboBox();
this.FitPage = new System.Windows.Forms.ToolStripButton();
this.FitWidth = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.panel1 = new System.Windows.Forms.Panel();
this.Open.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -127,46 +127,6 @@
this.Open.TabIndex = 5;
this.Open.Text = "toolStrip1";
//
// txtPageNumber
//
this.txtPageNumber.AutoSize = false;
this.txtPageNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtPageNumber.Font = new System.Drawing.Font("Segoe UI", 9F);
this.txtPageNumber.Name = "txtPageNumber";
this.txtPageNumber.Size = new System.Drawing.Size(35, 23);
this.txtPageNumber.Text = "1";
this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// zoomComboBox
//
this.zoomComboBox.Items.AddRange(new object[] {
"50%",
"75%",
"100%",
"125%",
"150%",
"200%",
"400%"});
this.zoomComboBox.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomComboBox.Name = "zoomComboBox";
this.zoomComboBox.Size = new System.Drawing.Size(75, 31);
this.zoomComboBox.Text = "100%";
this.zoomComboBox.SelectedIndexChanged += new System.EventHandler(this.zoomComboBox_SelectedIndexChanged);
//
// panel1
//
this.panel1.Controls.Add(this.Open);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(76, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(781, 41);
this.panel1.TabIndex = 6;
//
// btnFirst
//
this.btnFirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -193,6 +153,16 @@
this.btnPrevious.ToolTipText = "Vorherige Seite";
this.btnPrevious.Click += new System.EventHandler(this.btnPrevious_Click);
//
// txtPageNumber
//
this.txtPageNumber.AutoSize = false;
this.txtPageNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtPageNumber.Font = new System.Drawing.Font("Segoe UI", 9F);
this.txtPageNumber.Name = "txtPageNumber";
this.txtPageNumber.Size = new System.Drawing.Size(35, 23);
this.txtPageNumber.Text = "1";
this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btnNext
//
this.btnNext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -219,6 +189,11 @@
this.btnLast.ToolTipText = "Letzte Seite";
this.btnLast.Click += new System.EventHandler(this.btnLast_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// zoomIn
//
this.zoomIn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -243,6 +218,22 @@
this.zoomOut.ToolTipText = "Vergrössern";
this.zoomOut.Click += new System.EventHandler(this.zoomOut_Click);
//
// zoomComboBox
//
this.zoomComboBox.Items.AddRange(new object[] {
"50%",
"75%",
"100%",
"125%",
"150%",
"200%",
"400%"});
this.zoomComboBox.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomComboBox.Name = "zoomComboBox";
this.zoomComboBox.Size = new System.Drawing.Size(75, 31);
this.zoomComboBox.Text = "100%";
this.zoomComboBox.SelectedIndexChanged += new System.EventHandler(this.zoomComboBox_SelectedIndexChanged);
//
// FitPage
//
this.FitPage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -277,9 +268,18 @@
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(28, 28);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Text = "PDF Drucken";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// panel1
//
this.panel1.Controls.Add(this.Open);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(76, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(781, 41);
this.panel1.TabIndex = 6;
//
// DocPreview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

6
Client/UIControls/DocPreview.cs
View File

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using Database;
using System.Linq.Expressions;
using System.Web.Security;
namespace OnDoc.UIControls
{
@@ -269,5 +270,10 @@ namespace OnDoc.UIControls
{
pdfViewerControl1.Print(true);
}
public void printpdf()
{
pdfViewerControl1.Print(true);
}
}
}

34
Client/UIControls/DocPreview.resx
View File

@@ -132,10 +132,10 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADVSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGygyyC2u
1NEtvuwJSC9ZBtnb17MA1bfZh+X9hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3
1NEtvuwJSC9ZBtnb17MA1bfZh+b+hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3
CFktOiZokEdChalrfPkdZHXYMF6DXGLL5XB5BR0TdlFipZZbbMklZHXYMFFhZB9fzwH03mRkteiYKINg
wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eLzflNkEAwgJw2KDAIBSGItXwQA
J9Qz8tyQmCQAAAAASUVORK5CYII=
wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eJzf1NkEAwgJw2KDAIBSGItXwQA
IEsz79EkZgAAAAAASUVORK5CYII=
</value>
</data>
<data name="btnPrevious.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -143,8 +143,8 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACzSURBVDhPYyAFeMWXSLjFlW2FcgkDt/jyYLf4ojdA+j9U
CDdwSSvnd40rXwRSDMNQKezALa7U0TGm7BGyBpya7OPrOdziy/qACv6hawBhqDIEcI4tN3SNK7uKTTEM
Q5UyMISGhjK7xJVXucXn/camEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk
QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCkPg6mmNw2kwAAAABJRU5ErkJggg==
Q5UyMISGhjK7xJVXucXn/samEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk
QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCgdQ6kWu3sLwAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -152,39 +152,39 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACeSURBVDhPY3CNLd3iFV8iwUAKcIsv/w/Er90TyoKgQoQB
VBMYu8aXLfSIrueDSuEGyJoguOihe3y5A1QaO8DUBMb/gLjXPr6eA6oMFaApRsEu8eVXXONLDKBKEQCb
YhQcVv7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0
TMjAAAAG+g6sHS8nigAAAABJRU5ErkJggg==
YhQcWv7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0
TMjAAAADTw6q3g6ecAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnLast.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADaSURBVDhPY3CNK1/kl1TKy0AiAOp74BZf/h+GGUCEa3z5
HY+EClOoGqIAVoMgOO+3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA
HY+EClOoGqIAVoMgOPe3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA
sJtsH1/PAdWLAkgyCIxjSy55JFZqQfXDAekGAbFLRPknl9hyOagZYECyQbiSBmlhhCexEmUQyCtuCWVR
UD1YAREGlZ1wTqxQgqrHCXAaZB+W9xdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA
alD5fwDu3zPxKNmfQgAAAABJRU5ErkJggg==
UD1YAREGlZ1wTqxQgqrHCXAaZB+a+xdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA
alD5fwDplDPuaUZeUwAAAABJRU5ErkJggg==
</value>
</data>
<data name="zoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/0GYTAb
JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2YXl/sWnEhsFqgXqg2iHANa48EJti
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/4GYTAb
JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2obl/sWnEhsFqgXqg2iHANa48EJti
YjBIL9gQ+/h8Aafo4lfYFBGDQXpBZjAAObnokmTgXAaXuPJDWCRIwiAzQC76hizoHl/uQAxG1gPE30AG
IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgA/mnxXG9M
KfwAAAAASUVORK5CYII=
IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgA4VXxUAJa
VPcAAAAASUVORK5CYII=
</value>
</data>
<data name="zoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/0GYTAb
JAaUA6mBKscO3GMrXFzjy++4xZf/x4ed40tug9RCtaECoG2Z9mF5f7FpxIbBaoF6oNohwDWuPBCr4viy
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vF5/4GYTAb
JAaUA6mBKscO3GMrXFzjy++4xZf/x4ed40tug9RCtaECoG2Z9qG5f7FpxIbBaoF6oNohwDWuPBCr4viy
j85xJRdAGMTGpgakF2yIfXy+gFN08SusiuJLN4AVAQGIjU0NSC/IDAYgJxddEoaJMQiKcxlc4soPYZEA
Y2INApkBctE3ZEH3+HIHGHaNqdSBmsMAYiPLIesB4m8gg5AF/kP1EQQY+oAEiotc40sM4DimWBGqD+ii
YkVkOWQ9QPyNqmFEnVijWjoCK8KRst3ii94A6QMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+
fLVbfNkT4sojBgYA29fNZohv9VsAAAAASUVORK5CYII=
fLVbfNkT4sojBgYAvsPNWp0R0zgAAAAASUVORK5CYII=
</value>
</data>
<data name="FitPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

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

@@ -135,13 +135,14 @@ namespace OnDoc.UICintrols
this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
this.lblToApprove = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -598,6 +599,7 @@ namespace OnDoc.UICintrols
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32;
this.ribbonButtonVersandstrasse.Text = "Versandstrasse";
this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click);
//
// RibbonPanelDemo
@@ -1107,6 +1109,31 @@ namespace OnDoc.UICintrols
this.ribbonButtonSysadmins.Text = "Sys-Admins";
this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click);
//
// ribbonPanel1
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image")));
this.ribbonbuttonedklog.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.LargeImage")));
this.ribbonbuttonedklog.Name = "ribbonbuttonedklog";
this.ribbonbuttonedklog.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.SmallImage")));
this.ribbonbuttonedklog.Text = "EDK-DATA/-LOG";
this.ribbonbuttonedklog.Click += new System.EventHandler(this.ribbonbuttonedklog_Click);
//
// ribbonbuttonedkverarbeitung
//
this.ribbonbuttonedkverarbeitung.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.Image")));
this.ribbonbuttonedkverarbeitung.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.LargeImage")));
this.ribbonbuttonedkverarbeitung.Name = "ribbonbuttonedkverarbeitung";
this.ribbonbuttonedkverarbeitung.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedkverarbeitung.SmallImage")));
this.ribbonbuttonedkverarbeitung.Text = "EDK OnDoc_EDOKA";
this.ribbonbuttonedkverarbeitung.Click += new System.EventHandler(this.ribbonbuttonedkverarbeitung_Click);
//
// lblToApprove
//
this.lblToApprove.AutoSize = true;
@@ -1139,21 +1166,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// ribbonPanel1
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image")));
this.ribbonbuttonedklog.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.LargeImage")));
this.ribbonbuttonedklog.Name = "ribbonbuttonedklog";
this.ribbonbuttonedklog.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.SmallImage")));
this.ribbonbuttonedklog.Text = "EDK-DATA/-LOG";
this.ribbonbuttonedklog.Click += new System.EventHandler(this.ribbonbuttonedklog_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1293,5 +1305,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonButton ribbonButtonSysadmins;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonbuttonedklog;
private System.Windows.Forms.RibbonButton ribbonbuttonedkverarbeitung;
}
}

141
Client/UIControls/DokList.cs
View File

@@ -119,7 +119,8 @@ namespace OnDoc.UICintrols
db = null;
refresh_ansichten();
}
private void refresh_ansichten(string Bezeichnung="") {
private void refresh_ansichten(string Bezeichnung = "")
{
ribbonCBAnsicht.DropDownItems.Clear();
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
@@ -133,7 +134,7 @@ namespace OnDoc.UICintrols
rl.Text = dr["bezeichnung"].ToString();
rl.Tag = Convert.ToInt32(dr["id"]);
ribbonCBAnsicht.DropDownItems.Add(rl);
if (Convert.ToBoolean(dr["standard"])==true && Bezeichnung=="")
if (Convert.ToBoolean(dr["standard"]) == true && Bezeichnung == "")
{
ribbonCBAnsicht.SelectedItem = rl;
standardview = dr["gridsettings"].ToString();
@@ -177,7 +178,7 @@ namespace OnDoc.UICintrols
}
catch { }
}
public void refresh_dokumente(string layout="")
public void refresh_dokumente(string layout = "")
{
if (datafilter != "")
{
@@ -193,16 +194,16 @@ namespace OnDoc.UICintrols
System.Data.DataTable dokumente = new System.Data.DataTable();
dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false);
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
if (layout=="") { layout = "trefferliste_relaunch"; }
if (layout == "") { layout = "trefferliste_relaunch"; }
TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1);
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
}
public void refresh_dokumente_filtered(string layout="")
public void refresh_dokumente_filtered(string layout = "")
{
DB db = new DB(AppParams.connectionstring);
int selectedIndex = RibbonCBProfil.SelectedIndex;
@@ -210,7 +211,7 @@ namespace OnDoc.UICintrols
{
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
}
catch
catch
{
load_Profile();
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
@@ -227,7 +228,7 @@ namespace OnDoc.UICintrols
}
private void update_ansicht (string bearbeitung_zwingend, string toApprove, string approved)
private void update_ansicht(string bearbeitung_zwingend, string toApprove, string approved)
{
if (dokwerte1.Width > 0)
{
@@ -276,7 +277,7 @@ namespace OnDoc.UICintrols
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[columnIndex].ToString();
selected_cellvalue=this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
selected_cellvalue = this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
update_ansicht(dataRow["Bearbeitung_Zwingend"].ToString(), dataRow["toapprove"].ToString(), dataRow["approved"].ToString());
return;
@@ -333,10 +334,21 @@ namespace OnDoc.UICintrols
private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
dokument_bearbeiten();
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1) {
if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?","Dokument bearbeiten",MessageBoxButtons.YesNo,MessageBoxIcon.Question) != DialogResult.Yes) { return; }
}
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid);
}
}
public void dokument_bearbeiten()
public void dokument_bearbeiten(string dokid)
{
if (dokid != "") { selected_dokumentid = dokid; }
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
DB db = new DB(AppParams.connectionstring);
@@ -596,7 +608,7 @@ namespace OnDoc.UICintrols
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
@@ -609,7 +621,7 @@ namespace OnDoc.UICintrols
else { return; }
}
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
@@ -634,7 +646,7 @@ namespace OnDoc.UICintrols
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
dokument_bearbeiten();
dokument_bearbeiten(selected_dokumentid);
}
break;
case 2:
@@ -764,12 +776,12 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Visible = false;
this.sfDataGrid1.ShowGroupDropArea = false;
this.RibbonPannelAnsicht.Visible = false;
}
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
@@ -798,11 +810,12 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
if (dataRow[11].ToString() != "True")
Logging.Logging.Debug("IdonHandler", "OnDocClient", dataRow["dokumentid"].ToString() + Convert.ToString(dataRow["Bearbeitung_Zwingend"]));
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"])== false)
{
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["ToApprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -824,10 +837,10 @@ namespace OnDoc.UICintrols
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (dataRow[11].ToString() != "True")
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false)
if (Convert.ToBoolean(dataRow["toapprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -871,11 +884,52 @@ namespace OnDoc.UICintrols
private void druckenToolStripMenuItem_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) drucken", "Dokument drucken", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
print_doc(documentid);
}
Cursor = Cursors.Default;
}
private void print_doc(string dokumentid)
{
DocGet gd = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok("", "", "");
dok = gd.GetDoc(selected_dokumentid);
gd.Print_Doc(dok.dokument);
dok = gd.GetDoc(dokumentid);
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = "";
switch (dok.doktype)
{
case "D":
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
System.IO.File.Delete(Filename);
op = null;
break;
case "X":
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
break;
case "P":
DocPreview docPreview = new DocPreview();
docPreview.Show_Doc(dokumentid);
docPreview.printpdf();
docPreview.Dispose();
break;
default:
break;
}
fh = null;
gd = null;
}
private void RibbonButtonTest1_Click(object sender, EventArgs e)
@@ -969,6 +1023,7 @@ namespace OnDoc.UICintrols
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) archiviern und abschliessen", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
@@ -978,6 +1033,7 @@ namespace OnDoc.UICintrols
archivedoc(documentid);
}
Cursor = Cursors.Default;
refresh_dokumente();
// return;
@@ -1069,6 +1125,14 @@ namespace OnDoc.UICintrols
fa.ShowDialog();
}
public void upruefung()
{
Refresh_Bewilligungen();
if (this.lblToApprove.Text == "") { MessageBox.Show("Es stehen keine Dokumente zur Unterschriftenprüfung an.", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
frmBewilligung bw = new frmBewilligung();
bw.Show();
}
private void Refresh_Bewilligungen()
{
DB db = new DB(AppParams.connectionstring);
@@ -1145,7 +1209,7 @@ namespace OnDoc.UICintrols
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
{
}
//pos_elements();
}
@@ -1267,7 +1331,7 @@ namespace OnDoc.UICintrols
//tagesdatum = "2024-11-29T00:00:00";
plaintext = plaintext.Replace("@today@", tagesdatum);
plaintext = Strings.Base64Encode(plaintext);
bytes=Convert.FromBase64String(plaintext);
bytes = Convert.FromBase64String(plaintext);
using (MemoryStream ms = new MemoryStream(bytes))
{
this.sfDataGrid1.Deserialize(ms);
@@ -1276,6 +1340,7 @@ namespace OnDoc.UICintrols
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
}
@@ -1358,7 +1423,7 @@ namespace OnDoc.UICintrols
}
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard) values(";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "',"+sa.alsStandard.ToString()+")";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString() + ")";
db.Exec_SQL(sql);
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
@@ -1373,7 +1438,9 @@ namespace OnDoc.UICintrols
private void RibbonButtonViewDelete_Click(object sender, EventArgs e)
{
if (ribbonCBAnsicht.SelectedItem.Text.Trim()=="" || ribbonCBAnsicht.SelectedItem.Text.Substring(0,4)==" Heu")
string bez = ribbonCBAnsicht.SelectedItem.Text.Trim();
if (bez.Length < 4) { bez = bez + " "; }
if (bez == "" || bez == " Heu")
{
MessageBox.Show("Die gewählte Standard-Ansicht kann nicht gelöscht werden", "Ansicht löschen", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -1399,7 +1466,7 @@ namespace OnDoc.UICintrols
FileHelper fh = new FileHelper();
string b = fh.Base64FromFile(@"x:\gridsettings2.xml");
DB db = new DB(AppParams.connectionstring);
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100");
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
@@ -1428,7 +1495,7 @@ namespace OnDoc.UICintrols
if (dokwerte1.Width == 0)
{
dokwerte1.Width = 300;
dokwerte1.set_panelheight( sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.Update_Werte(selected_dokumentid);
}
@@ -1454,7 +1521,6 @@ namespace OnDoc.UICintrols
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
@@ -1507,7 +1573,8 @@ namespace OnDoc.UICintrols
selected_dokumentid = "";
selected_partnernr = "";
selected_cellvalue = "";
} else
}
else
{
RibbonButtonEditEditDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
@@ -1528,10 +1595,10 @@ namespace OnDoc.UICintrols
selected_partnernr = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "partner-nr").ToString();
selected_cellvalue = selected_dokumentid;
string bearbeitung_zwingend= sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string bearbeitung_zwingend = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString();
string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString();
update_ansicht(bearbeitung_zwingend,toapprove,approved);
update_ansicht(bearbeitung_zwingend, toapprove, approved);
}
}
@@ -1597,6 +1664,12 @@ namespace OnDoc.UICintrols
edk_viewer ev = new edk_viewer();
ev.Show();
}
private void ribbonbuttonedkverarbeitung_Click(object sender, EventArgs e)
{
TableEditor tb = new TableEditor("OnDoc_EDK_Routing");
tb.Show();
}
}
}

39
Client/UIControls/DokList.resx
View File

@@ -506,40 +506,55 @@
<data name="ribbonButtonSysadmins.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedklog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

34
Client/UIControls/Dokwerte.Designer.cs generated
View File

@@ -31,8 +31,12 @@
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.grppruefung = new System.Windows.Forms.GroupBox();
this.sfdatagridpruefung = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.panel1.SuspendLayout();
this.grppruefung.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfdatagridpruefung)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
@@ -42,7 +46,7 @@
this.sfDataGrid1.Location = new System.Drawing.Point(0, 100);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(381, 611);
this.sfDataGrid1.Size = new System.Drawing.Size(381, 421);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.Text = "sfDataGrid1";
this.sfDataGrid1.CopyCellContent += new Syncfusion.WinForms.DataGrid.Events.CellCutCopyPasteEventHandler(this.sfDataGrid1_CopyCellContent);
@@ -67,17 +71,43 @@
this.label1.TabIndex = 0;
this.label1.Text = "Attribute";
//
// grppruefung
//
this.grppruefung.Controls.Add(this.sfdatagridpruefung);
this.grppruefung.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grppruefung.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.grppruefung.Location = new System.Drawing.Point(0, 521);
this.grppruefung.Name = "grppruefung";
this.grppruefung.Size = new System.Drawing.Size(381, 190);
this.grppruefung.TabIndex = 2;
this.grppruefung.TabStop = false;
this.grppruefung.Text = "Prüfung";
//
// sfdatagridpruefung
//
this.sfdatagridpruefung.AccessibleName = "Table";
this.sfdatagridpruefung.BackColor = System.Drawing.SystemColors.Window;
this.sfdatagridpruefung.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfdatagridpruefung.Location = new System.Drawing.Point(3, 16);
this.sfdatagridpruefung.Name = "sfdatagridpruefung";
this.sfdatagridpruefung.Size = new System.Drawing.Size(375, 171);
this.sfdatagridpruefung.TabIndex = 0;
this.sfdatagridpruefung.Text = "sfDataGrid2";
//
// Dokwerte
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.sfDataGrid1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.grppruefung);
this.Name = "Dokwerte";
this.Size = new System.Drawing.Size(381, 711);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.grppruefung.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfdatagridpruefung)).EndInit();
this.ResumeLayout(false);
}
@@ -87,5 +117,7 @@
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox grppruefung;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridpruefung;
}
}

22
Client/UIControls/Dokwerte.cs
View File

@@ -44,10 +44,28 @@ namespace OnDoc.UIControls
db.add_parameter("@dokumentid", dokumentid);
db.Get_Tabledata("sp_ondoc_get_dokumentdetails", true, false);
this.sfDataGrid1.DataSource = db.dsdaten.Tables[0];
db = null;
sfDataGrid1.Columns[0].Width = 120;
sfDataGrid1.Columns[1].Width = 170;
db.Get_Tabledata("Select * from dokumentbewilligung where aktiv=1 and dokumentid='" + dokumentid + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
this.grppruefung.Height = this.Height = 150;
sfdatagridpruefung.DataSource=db.dsdaten.Tables[0];
for (int i = 3; i < sfdatagridpruefung.ColumnCount; i++)
{
sfdatagridpruefung.Columns[i].Visible = false;
}
sfdatagridpruefung.Columns[2].Width = 80;
sfdatagridpruefung.Columns[1].Width = 80;
sfdatagridpruefung.Columns[0].Width = sfdatagridpruefung.Width - 170;
}
else
{
this.grppruefung.Height = 0;
}
db = null;
}
private void sfDataGrid1_KeyUp(object sender, KeyEventArgs e)