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

update 20250219

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-19 18:10:21 +01:00
parent d0d96c0732
commit 8bd079b635
82 changed files with 921 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,8 @@ namespace OnDoc.UICintrols
this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -51,7 +53,6 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -63,6 +64,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -166,9 +168,7 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -207,7 +207,7 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
@@ -272,6 +272,19 @@ namespace OnDoc.UICintrols
this.druckenToolStripMenuItem.Visible = false;
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
@@ -346,14 +359,6 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentFürPartnerErstellenToolStripMenuItem
//
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
@@ -486,6 +491,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -1387,16 +1402,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1405,11 +1410,6 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

25
Client/UIControls/DokList.cs
View File

@@ -646,11 +646,28 @@ namespace OnDoc.UICintrols
private void OpenDoc(clsdok dok, bool editdoc, bool interop = false, bool runmacros = false)
{
//DB db = new DB(AppParams.connectionstring);
//string docfilename = "";
//try
//{
// db.Get_Tabledata("Select dokumentname from dokument where dokumentid='" + selected_dokumentid + "'", false, true);
// docfilename = db.dsdaten.Tables[0].Rows[0][0].ToString();
//}
//catch
//{
// docfilename = selected_dokumentid;
//}
//finally {
// db = null;
//}
switch (dok.extension.ToUpper().Substring(0, 1))
{
case "D":
clsFileHelper fh = new clsFileHelper();
string tempfilename = "";
tempfilename = fh.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
//System.Diagnostics.Process.Start(tempfilename);
if (interop == true)
@@ -661,7 +678,7 @@ namespace OnDoc.UICintrols
}
else
{
System.Diagnostics.Process.Start("winword.exe", "/w " + tempfilename);
System.Diagnostics.Process.Start("winword.exe", "/n " + tempfilename);
}
if (editdoc == true)
@@ -692,7 +709,7 @@ namespace OnDoc.UICintrols
break;
case "P":
clsFileHelper fh3 = new clsFileHelper();
tempfilename = fh3.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
tempfilename = fh3.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension );
System.Diagnostics.Process.Start(tempfilename);
if (editdoc == true)
{
@@ -2167,6 +2184,7 @@ namespace OnDoc.UICintrols
if (get_selected_records() == 0)
{
RibbonButtonEditEditDoc.Enabled = false;
ribbibButtonShowDoc.Enabled = false;
RibbonButtonEditDelete.Enabled = false;
RibbonButtonZuweisen.Enabled = false;
ribbonButtonToApproval.Enabled = false;
@@ -2186,6 +2204,7 @@ namespace OnDoc.UICintrols
else
{
RibbonButtonEditEditDoc.Enabled = true;
ribbibButtonShowDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
RibbonButtonZuweisen.Enabled = true;
ribbonButtonToApproval.Enabled = true;
@@ -2230,6 +2249,7 @@ namespace OnDoc.UICintrols
if (get_selected_records() == 0)
{
RibbonButtonEditEditDoc.Enabled = false;
ribbibButtonShowDoc.Enabled = false;
RibbonButtonEditDelete.Enabled = false;
RibbonButtonZuweisen.Enabled = false;
ribbonButtonToApproval.Enabled = false;
@@ -2245,6 +2265,7 @@ namespace OnDoc.UICintrols
else
{
RibbonButtonEditEditDoc.Enabled = true;
ribbibButtonShowDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
RibbonButtonZuweisen.Enabled = true;
ribbonButtonToApproval.Enabled = true;

2
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -942,7 +942,7 @@ namespace OnDoc.UIControls
{
Partnersuche p = new Partnersuche();
p.ShowDialog();
if (p.partnernr != 0) { return p.partnernr.ToString() + " - " + p.partnerkurzname; } else { return ""; }
if (p.partnernr != 0) { return p.partnernr.ToString() + "-" + p.partnerkurzname; } else { return ""; }
}
valueselector vs = new valueselector();