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

Update 20240723

Browse Source
This commit is contained in:
Stefan Hutter
2024-07-23 12:48:07 +02:00
parent ea8d48ac9e
commit c3cacbec3c
79 changed files with 1294 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
this.tabControlAdv1 = new Syncfusion.Windows.Forms.Tools.TabControlAdv();
this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.cbPDFDirekteArchivierung = new System.Windows.Forms.CheckBox();
this.cbPDFDokument = new System.Windows.Forms.CheckBox();
this.cbOfficeDokument = new System.Windows.Forms.CheckBox();
@@ -72,7 +73,6 @@
this.TxTBezeichnung = new System.Windows.Forms.TextBox();
this.Label1 = new System.Windows.Forms.Label();
this.tabPageAdv2 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.checkBox1 = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -88,13 +88,13 @@
//
// tabControlAdv1
//
this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1544, 659);
this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1178, 659);
this.tabControlAdv1.Controls.Add(this.tabPageAdv1);
this.tabControlAdv1.Controls.Add(this.tabPageAdv2);
this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControlAdv1.Location = new System.Drawing.Point(2, 2);
this.tabControlAdv1.Name = "tabControlAdv1";
this.tabControlAdv1.Size = new System.Drawing.Size(1544, 659);
this.tabControlAdv1.Size = new System.Drawing.Size(1178, 659);
this.tabControlAdv1.TabIndex = 0;
//
// tabPageAdv1
@@ -108,7 +108,7 @@
this.tabPageAdv1.Location = new System.Drawing.Point(1, 25);
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1541, 632);
this.tabPageAdv1.Size = new System.Drawing.Size(1175, 632);
this.tabPageAdv1.TabIndex = 1;
this.tabPageAdv1.Text = "Allgemein";
this.tabPageAdv1.ThemesEnabled = false;
@@ -126,6 +126,16 @@
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Dokument-Produktion";
//
// checkBox1
//
this.checkBox1.Enabled = false;
this.checkBox1.Location = new System.Drawing.Point(202, 19);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(280, 24);
this.checkBox1.TabIndex = 9;
this.checkBox1.Text = "Bearbeitung zwingend";
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// cbPDFDirekteArchivierung
//
this.cbPDFDirekteArchivierung.Enabled = false;
@@ -544,25 +554,16 @@
this.tabPageAdv2.Location = new System.Drawing.Point(1, 25);
this.tabPageAdv2.Name = "tabPageAdv2";
this.tabPageAdv2.ShowCloseButton = true;
this.tabPageAdv2.Size = new System.Drawing.Size(1541, 632);
this.tabPageAdv2.Size = new System.Drawing.Size(1175, 632);
this.tabPageAdv2.TabIndex = 2;
this.tabPageAdv2.Text = "Voralgenfelder";
this.tabPageAdv2.ThemesEnabled = false;
//
// checkBox1
//
this.checkBox1.Enabled = false;
this.checkBox1.Location = new System.Drawing.Point(202, 19);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(280, 24);
this.checkBox1.TabIndex = 9;
this.checkBox1.Text = "Bearbeitung erzwingen";
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1548, 663);
this.ClientSize = new System.Drawing.Size(1182, 663);
this.Controls.Add(this.tabControlAdv1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "Dokumenttyp";

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

@@ -42,5 +42,10 @@ namespace OnDoc.UIControls.Administrator
{
}
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
}
}
}

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

@@ -85,6 +85,8 @@
this.RibbonButtonVorlagen = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -352,6 +354,7 @@
this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelProfil);
this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelCreate);
this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelDoklist);
this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelDemo);
this.RibbonTabUserFunctions.Text = "Funktionen";
//
// RibbonPanelExit
@@ -617,6 +620,21 @@
this.RibbonButtonCreateNewDoc.Text = "Dokument";
this.RibbonButtonCreateNewDoc.Click += new System.EventHandler(this.RibbonButtonCreateNewDoc_Click);
//
// RibbonPanelDemo
//
this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1);
this.RibbonPanelDemo.Name = "RibbonPanelDemo";
this.RibbonPanelDemo.Text = "Test-Funktionen";
//
// RibbonButtonTest1
//
this.RibbonButtonTest1.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.Image")));
this.RibbonButtonTest1.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.LargeImage")));
this.RibbonButtonTest1.Name = "RibbonButtonTest1";
this.RibbonButtonTest1.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.SmallImage")));
this.RibbonButtonTest1.Text = "Test 1";
this.RibbonButtonTest1.Click += new System.EventHandler(this.RibbonButtonTest1_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -698,5 +716,7 @@
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton RibbonButtonDokumenttyp;
private System.Windows.Forms.RibbonButton RibbonButtonVorlagen;
private System.Windows.Forms.RibbonPanel RibbonPanelDemo;
private System.Windows.Forms.RibbonButton RibbonButtonTest1;
}
}

40
Client/UIControls/DokList.cs
View File

@@ -152,6 +152,16 @@ namespace OnDoc.UICintrols
documentid = dataRow["dokumentid"].ToString();
selected_dokumentid = documentid;
selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString();
if (dataRow["Bearbeitung_Zwingend"].ToString() == "1")
{
RibbonButtonArchivToOnBase.Enabled=false;
archivierenToolStripMenuItem.Enabled=false;
}
else
{
RibbonButtonArchivToOnBase.Enabled=true;
archivierenToolStripMenuItem.Enabled= true;
}
}
catch
{
@@ -552,11 +562,25 @@ namespace OnDoc.UICintrols
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X +20, e.Bounds.Y);
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "P")
{
@@ -597,6 +621,18 @@ namespace OnDoc.UICintrols
gd.Print_Doc(dok.dokument);
}
private void RibbonButtonTest1_Click(object sender, EventArgs e)
{
DOCGEN.DocGet dg = new DOCGEN.DocGet(AppParams.connectionstring);
clsdok doc = new clsdok("", "", "");
doc = GetDoc(false);
dg.Print_Doc(doc.dokument);
}
}
}

33
Client/UIControls/DokList.resx
View File

@@ -357,42 +357,63 @@
HwlkxKJc0Gw7nIj2L2EcX4yAJ6eqqQ6ginIFDHpjsMzbMP7BjK8bLriJWZ1D0M1P4agrjHWWr3enUgBo
QiD04bcGdOrb0KE7TKwVpx+1YdxpQrrw7/UUgJpoEU9+nE0mQB5XAEJR2bUh4De6MJTcWL7XngAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="RibbonButtonTest1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="RibbonButtonTest1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="RibbonButtonTest1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
</value>
</data>
<data name="RibbonButtonDokumenttyp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonDokumenttyp.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonDokumenttyp.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="RibbonButtonVorlagen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonVorlagen.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonVorlagen.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

4
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -207,8 +207,8 @@ namespace OnDoc.UIControls
public void Update_DocGenData()
{
docgendata.partnernr = this.partnernr.ToString();
docgendata.inhaberadresse = "";
docgendata.zustelladresse = "";
docgendata.inhaberadresse = this.txtPartnerInhaber.Text;
docgendata.zustelladresse = this.txtPartnerZusteller.Text;
docgendata.dokumenttypnr = dokumenttypnr.ToString();
docgendata.unterschriftLinks = cbboxunterschriftlinks.SelectedValue.ToString();
docgendata.unterschriftRehts = cbboxunterschriftrechts.SelectedValue.ToString();