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

update 0250704

Browse Source
This commit is contained in:
Stefan Hutter
2025-07-04 21:40:19 +02:00
parent 6763534b8c
commit 68e4725ff5
71 changed files with 483 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(142, 26);
this.label2.TabIndex = 2;
this.label2.Text = "20. Juni 2025";
this.label2.Text = "26. Juni 2025";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// SplashScreen

34
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -32,8 +32,8 @@ namespace OnDoc.DocMgmt
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokTypSelect));
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.ribbon1 = new System.Windows.Forms.Ribbon();
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
@@ -277,15 +277,15 @@ namespace OnDoc.DocMgmt
// treeViewAdv1
//
this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window);
treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black;
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.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(494, 517);
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStripVorlagen;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -371,15 +371,15 @@ namespace OnDoc.DocMgmt
//
this.treeViewAdv2.AllowDrop = true;
this.treeViewAdv2.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window);
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;
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.treeViewAdv2.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdv2.BeforeTouchSize = new System.Drawing.Size(498, 523);
this.treeViewAdv2.ContextMenuStrip = this.contextMenuStripFavoriten;
this.treeViewAdv2.Dock = System.Windows.Forms.DockStyle.Fill;

7
Client/DocMgmt/DokTypSelect.cs
View File

@@ -186,7 +186,7 @@ namespace OnDoc.DocMgmt
}
if (vorlagentype == 1)
if (vorlagentype == 1 || vorlagentype==4)
{
this.Text = "Vorlage auswählen";
//Standard Vorlagen
@@ -248,7 +248,10 @@ namespace OnDoc.DocMgmt
treeViewAdv1.ExpandAll();
}
db = null;
get_einzeldokumente(where);
if ( vorlagentype==1)
{
get_einzeldokumente(where);
}
}
else

8
Client/DocMgmt/DokTypSelect.resx
View File

@@ -283,7 +283,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
DQAAAk1TRnQBSQFMAgEBBwEAAXgBAQF4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DQAAAk1TRnQBSQFMAgEBBwEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -350,12 +350,6 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>723, 16</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>723, 16</value>
</metadata>

1
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -45,6 +45,7 @@ namespace OnDoc.DocMgmt
public bool editdoc { get; set; } = false;
public Dokumenterstellung()

18
Client/Klassen/clsAppParams.cs
View File

@@ -69,6 +69,9 @@ namespace OnDoc.Klassen
public static bool AutomArchivierung { get; set; } = false;
public static string SignApp { get; set; } = "";
public static string MachinName { get; set; } = "";
public static bool O365 { get; set; } = false;
static AppParams()
{
@@ -84,6 +87,21 @@ namespace OnDoc.Klassen
logconnectionstring = StringCipher.Decrypt(logconnectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from ondoc_appParams where usedbparams=1", false, true);
//MachinName = System.Environment.MachineName;
//O365=false;
//try
//{
// List<List<string>> groups = new List<List<string>>();
// List<string> current = null;
// foreach (var line in System.IO.File.ReadAllLines(Application.StartupPath+@"o365machines.txt"))
// {
// if (line.Contains(MachinName))
// {
// O365 = true;
// }
// }
//}
//catch { O365 = false; }
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
tempdir = db.dsdaten.Tables[0].Rows[0][0].ToString();

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

@@ -46,9 +46,10 @@
this.FitPage = new System.Windows.Forms.ToolStripButton();
this.FitWidth = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.tsbtnrefresh = new System.Windows.Forms.ToolStripButton();
this.tsschnellansicht = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox();
this.panel1 = new System.Windows.Forms.Panel();
this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl();
this.tsbtnrefresh = new System.Windows.Forms.ToolStripButton();
this.Open.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -79,11 +80,12 @@
this.FitPage,
this.FitWidth,
this.toolStripButton1,
this.tsbtnrefresh});
this.tsbtnrefresh,
this.tsschnellansicht});
this.Open.Location = new System.Drawing.Point(3, 0);
this.Open.Name = "Open";
this.Open.Padding = new System.Windows.Forms.Padding(5);
this.Open.Size = new System.Drawing.Size(482, 41);
this.Open.Size = new System.Drawing.Size(665, 41);
this.Open.TabIndex = 5;
this.Open.Text = "toolStrip1";
//
@@ -96,7 +98,7 @@
this.btnFirst.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnFirst.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.btnFirst.Name = "btnFirst";
this.btnFirst.Size = new System.Drawing.Size(23, 31);
this.btnFirst.Size = new System.Drawing.Size(29, 31);
this.btnFirst.ToolTipText = "Erste Seite";
this.btnFirst.Click += new System.EventHandler(this.btnFirst_Click);
//
@@ -109,7 +111,7 @@
this.btnPrevious.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnPrevious.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.btnPrevious.Name = "btnPrevious";
this.btnPrevious.Size = new System.Drawing.Size(23, 31);
this.btnPrevious.Size = new System.Drawing.Size(29, 31);
this.btnPrevious.ToolTipText = "Vorherige Seite";
this.btnPrevious.Click += new System.EventHandler(this.btnPrevious_Click);
//
@@ -119,7 +121,7 @@
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.Size = new System.Drawing.Size(35, 27);
this.txtPageNumber.Text = "1";
this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
@@ -132,7 +134,7 @@
this.btnNext.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnNext.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(23, 31);
this.btnNext.Size = new System.Drawing.Size(29, 31);
this.btnNext.ToolTipText = "Nächste Seite";
this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
//
@@ -145,7 +147,7 @@
this.btnLast.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnLast.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.btnLast.Name = "btnLast";
this.btnLast.Size = new System.Drawing.Size(23, 31);
this.btnLast.Size = new System.Drawing.Size(29, 31);
this.btnLast.ToolTipText = "Letzte Seite";
this.btnLast.Click += new System.EventHandler(this.btnLast_Click);
//
@@ -162,7 +164,7 @@
this.zoomIn.ImageTransparentColor = System.Drawing.Color.Magenta;
this.zoomIn.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomIn.Name = "zoomIn";
this.zoomIn.Size = new System.Drawing.Size(23, 31);
this.zoomIn.Size = new System.Drawing.Size(29, 31);
this.zoomIn.ToolTipText = "Verkleinern";
this.zoomIn.Click += new System.EventHandler(this.zoomIn_Click);
//
@@ -174,7 +176,7 @@
this.zoomOut.ImageTransparentColor = System.Drawing.Color.Magenta;
this.zoomOut.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.zoomOut.Name = "zoomOut";
this.zoomOut.Size = new System.Drawing.Size(23, 31);
this.zoomOut.Size = new System.Drawing.Size(29, 31);
this.zoomOut.ToolTipText = "Vergrössern";
this.zoomOut.Click += new System.EventHandler(this.zoomOut_Click);
//
@@ -202,7 +204,7 @@
this.FitPage.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FitPage.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.FitPage.Name = "FitPage";
this.FitPage.Size = new System.Drawing.Size(23, 31);
this.FitPage.Size = new System.Drawing.Size(29, 31);
this.FitPage.ToolTipText = "Eine Seite";
this.FitPage.Visible = false;
this.FitPage.Click += new System.EventHandler(this.FitPage_Click);
@@ -215,7 +217,7 @@
this.FitWidth.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FitWidth.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
this.FitWidth.Name = "FitWidth";
this.FitWidth.Size = new System.Drawing.Size(23, 31);
this.FitWidth.Size = new System.Drawing.Size(29, 31);
this.FitWidth.Text = "FitWidth";
this.FitWidth.ToolTipText = "Seitenbreite";
this.FitWidth.Visible = false;
@@ -227,10 +229,30 @@
this.toolStripButton1.Image = global::OnDoc.Properties.Resources.Printer_24x24_32;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(28, 28);
this.toolStripButton1.Size = new System.Drawing.Size(29, 28);
this.toolStripButton1.Text = "PDF Drucken";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// tsbtnrefresh
//
this.tsbtnrefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbtnrefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.tsbtnrefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnrefresh.Name = "tsbtnrefresh";
this.tsbtnrefresh.Size = new System.Drawing.Size(29, 28);
this.tsbtnrefresh.Text = "Refresh";
this.tsbtnrefresh.ToolTipText = "Dokument aktualisieren";
this.tsbtnrefresh.Click += new System.EventHandler(this.tsbtnrefresh_Click);
//
// tsschnellansicht
//
this.tsschnellansicht.Checked = true;
this.tsschnellansicht.CheckState = System.Windows.Forms.CheckState.Checked;
this.tsschnellansicht.Name = "tsschnellansicht";
this.tsschnellansicht.Size = new System.Drawing.Size(124, 28);
this.tsschnellansicht.Text = "Schnellansicht";
this.tsschnellansicht.CheckedChanged += new System.EventHandler(this.tsschnellansicht_CheckedChanged);
//
// panel1
//
this.panel1.Controls.Add(this.Open);
@@ -281,17 +303,6 @@
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
this.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default;
//
// tsbtnrefresh
//
this.tsbtnrefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbtnrefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
this.tsbtnrefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnrefresh.Name = "tsbtnrefresh";
this.tsbtnrefresh.Size = new System.Drawing.Size(28, 28);
this.tsbtnrefresh.Text = "Refresh";
this.tsbtnrefresh.ToolTipText = "Dokument aktualisieren";
this.tsbtnrefresh.Click += new System.EventHandler(this.tsbtnrefresh_Click);
//
// DocPreview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -327,5 +338,6 @@
private System.Windows.Forms.ToolStripButton toolStripButton1;
private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl1;
private System.Windows.Forms.ToolStripButton tsbtnrefresh;
private Syncfusion.Windows.Forms.Tools.ToolStripCheckBox tsschnellansicht;
}
}

18
Client/UIControls/DocPreview.cs
View File

@@ -62,7 +62,12 @@ namespace OnDoc.UIControls
if (PrintDokID == dokumentid) { return; }
PrintDokID = dokumentid;
clsdok dok = new clsdok("", "", "","");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
if (dokumentid.Length > 25) {
dok.dokument = dokumentid;
} else
{
dok = GetDoc(true, dokumentid,this.tsschnellansicht.Checked);
}
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
@@ -127,7 +132,7 @@ namespace OnDoc.UIControls
}
private clsdok GetDoc(bool AsPDF, string dokumentid)
private clsdok GetDoc(bool AsPDF, string dokumentid, bool schnellansicht = false)
{
clsdok dok = new clsdok("", "", "", "");
if (dokumentid == "")
@@ -167,7 +172,7 @@ namespace OnDoc.UIControls
DocGet gd = new DocGet(AppParams.connectionstring);
if (AsPDF == true)
{
dok = gd.GetDocAsPDF(dokumentid);
dok = gd.GetDocAsPDF(dokumentid,null,AppParams.tempdir, schnellansicht);
}
else
{
@@ -318,5 +323,12 @@ namespace OnDoc.UIControls
Show_Doc(tmpdokid);
}
private void tsschnellansicht_CheckedChanged(object sender, EventArgs e)
{
string tmpdokid = PrintDokID.ToString();
PrintDokID = "";
Show_Doc(tmpdokid);
}
}
}

50
Client/UIControls/DocPreview.resx
View File

@@ -124,66 +124,66 @@
<data name="btnFirst.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt
rtTRLb7sCUgvWQbZ29ezuMWXt9kHZPyF6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt
rtTRLb7sCUgvWQbZ29ezuMWXt9n7pf2F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX
vghdM0kGeSRUmLrGl99B14iO8RrkElsuh8sr6BivQSDgkVip5RZbcgldIzomaBAI2MfXc7jGl09G10yy
QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xGb8pMggGkJMGRQaBACyxAgD6jzPg
UwBkagAAAABJRU5ErkJggg==
QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xab8pMggGkJMGRQaBACyxAgDrfTPa
tvmLXAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnPrevious.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX
/0eXwwAuaeX8rnHli0CKYRhdDQpwiyt1dIwpe4SsAacm+/h6Drf4sj63+PJ/6BqwanKOLTd0jSu7iq4Q
q6bQ0FBml7jyKrf4jN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc
uciApGSEDEhOsMiApKyBDGCZEACNiA6aQ3+faAAAAABJRU5ErkJggg==
q6bQ0FBml7jyKrf4tN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc
uciApGSEDEhOsMiApKyBDGCZEACF9g6WWkMUggAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O
J4BqAmPX+LKFHtH1fOhqMACyJggueugeX+6Arg4FYGoC439u8eW99vH1HOjqwQCLBjh2iS+/4hpfYoCu
B68mMA4o/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO
JgQA8OkOoMmEN+gAAAAASUVORK5CYII=
B68mMPYr/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO
JgQA6ZMOnBDgDiMAAAAASUVORK5CYII=
</value>
</data>
<data name="btnLast.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8
+R2PhApTdMX4AFaDIDjjt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8
+R2PhApTdMX4AFaDIDjtt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq
uvLJ9vH1HOiGgABJBoFxbMklj8RKLcoNii//7xJR/skltlyOIoNwJQ2SDMKXWIkyCOQVt4SyKHTNyIAI
g8pOOCdWKKFrRAc4DbIPyPjrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA
zx0z3yl34G0AAAAASUVORK5CYII=
g8pOOCdWKKFrRAc4DbL3S/vrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA
xIcz2dQw6AYAAAAASUVORK5CYII=
</value>
</data>
<data name="zoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xWf8BmEw
GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2ARl/0TXhwmC1cWWZKIa4xpUH
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw
GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2fml/0TXhwmC1cWWZKIa4xpUH
oiskFoP0gg2xj88XcIoufoWugFgM0gsyg8EtvjwXXZIMnMvgEld+CIsESRhkBshF35AF3ePLHYjBaIZ9
AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAT/HxFGJn3nQA
AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAFcnw/PEJ/FIA
AAAASUVORK5CYII=
</value>
</data>
<data name="zoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEaSURBVDhPrVQxbsJAEHSRB+QL6Sn4gVHwLW1SIswtJRQI
CcytqfgPNDwB8QL6pEsqlCYNTYRAe3Ane40DSB5ppNXtzNzKvrsgEAjD+VOk0zZos4iQvgD7f0xb85pO
26yRvhxa3TRSSJ+AdPyPTUw+WCv9FqDNIHzrH6SpjFarzSAXojS9S6EVo/lt6mTL5Fr2mey1ISGOnl87
k50UWBFOV34znK5kn8lezggAaSibjwRdOAwiTZsrjYeCOIMn2mcXW0gNRxXPaj4ontWyPRG256BcujPe
QsEnJ1KY1D3jyYszcp3tFSaq8htV89cqO0dWVHKyAcc/gLQ+09YFjT/ZDpXcNQfoGXXP7WdN6e138O8R
0hLQfN/7Hp0ALV/NHkExnWYAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw
GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9n5pf9E14cJgtXFlmSiGuMaVB6Ir
BCuOL/voHFdyAYRBbHR5EAbpBRtiH58v4BRd/ApdAVhRfOkGuGXxpRvQ5UEYpBdkBoNbfHkuuiQpBkFx
LoNLXPkhLBIkGQQyA+Sib8iC7vHlDjDsGlOpAzcoplIHWQ7NsG8gg1BMh2kkBDD0obvINb7EAI5jihVh
GkFsZDkMF1EzjKgTa1RLR2BFOFK2W3zRG7f48gMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+
fLVbfNkTYssjAPMozQbaRklFAAAAAElFTkSuQmCC
</value>
</data>
<data name="FitPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEuSURBVDhPrZRLTsMwEEAjOAfiKFCJGIl9lrURu0hdVIHY
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEuSURBVDhPrZRLTsMwEEAjOAfiKFCJGIl9lrURu0hdVIHY
lVhk0wP0Euy5UG+QO4CezbiO82mFOpKl8Xj85me5UMb9XGMVQbHbZ+Mep5bS7Sq3Dc6N3UYQhmJCqqq6
LXX7pYzb5WciAbYASiCS/iTsLOhp3T4EQNOr9cfR66+fd7nfZSBt69K038rYA/rL2/t97jcLIioXuq67
YS8gdGwEYFH6LIg++BK0rQVcardX2m5iIG1rfOgfsBEoQnw/7OGvnAgASHYhw6YXGM8jgticJtT0coHL
@@ -194,7 +194,7 @@
<data name="FitWidth.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADUSURBVDhPY3CLL/9PDcwAIlziylNc40sMyMEgvXCD3OPL
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADUSURBVDhPY3CLL/9PDcwAIlziylNc40sMyMEgvXCD3OPL
HRjIBCC9I8kgj8RKUde4sh63uLISdA0gUF9fz+QaV97iFlc23y2mQgUkhmGQR3SZjFt82WXX+PI77vHl
CuiGgDSCYyqh3Nc+vuyjW3z5a+eEMl0Ug9ziSh3d4kvPgNmo+ADcoPjyA5jypWcgepFcBDIdZAvINpCt
INthzkcGINeCXO0SX34F5AsMr4FtjalQAfkfFA6g8EA3BARA4ecWX94LCk8QH6tB5ICRYhDVcj81MABm

1
Client/UIControls/DokList.cs
View File

@@ -662,6 +662,7 @@ namespace OnDoc.UICintrols
else
{
Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid);
dokbearbeitung.ShowDialog();
DB db1 = new DB(AppParams.connectionstring);
switch (dokbearbeitung.DocFunction)

10
Client/UIControls/Serienbrief.cs
View File

@@ -666,7 +666,7 @@ namespace OnDoc.UIControls
{
OnDoc.DocMgmt.DokTypSelect DokTypSelect = new OnDoc.DocMgmt.DokTypSelect(false);
DokTypSelect.vorlagentype = 1;
DokTypSelect.vorlagentype = 4;
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
@@ -1151,7 +1151,13 @@ namespace OnDoc.UIControls
sb.barcode_zusatz = "";
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString();
try
{
if (sb.bezeichnung == "") { sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); }
}
catch { }
//sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString();
sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]);
sb.vertrag = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);

25
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -91,6 +91,11 @@ namespace OnDoc.UIControls
}
public void enabling_partnerselektion(bool enable)
{
sfButton1.Enabled = enable;
}
public void Refresh_Details()
{
var x = DateDokumentDatum.Culture.DateTimeFormat.FirstDayOfWeek;
@@ -331,6 +336,19 @@ namespace OnDoc.UIControls
{
Get_DokWertList(ref db, "", 1);
}
try
{
db.Get_Tabledata("Select count(*) from View_Dokumenttypen_Nativ where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
this.ChkTagesEndArchivierung.Visible = false;
}
}
catch
{
this.ChkTagesEndArchivierung.Visible = true;
}
db = null;
Refresh_Team();
@@ -1217,7 +1235,12 @@ namespace OnDoc.UIControls
Get_DokWertList(ref db, dokumentid, 0);
//Dokument in Wiederbearbeitung
db.Get_Tabledata("Select count(*) from edoka_journale.dbo.ondoc_wiederbearbeitung where dokumentid='" + dokumentid + "' and status = 0", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
this.sfButton1.Enabled = false;
}
db = null;
}

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/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.

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/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

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

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UIControls.DocPreview.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.