update 20240925

This commit is contained in:
Stefan Hutter
2024-09-25 19:14:14 +02:00
parent d4b9318d96
commit 9fcecb2c35
324 changed files with 1886317 additions and 353 deletions

View File

@@ -280,7 +280,7 @@ namespace OnDoc.UIControls.Administrator
case "DOT":
case "WORD":
case "DOTM":
SynFWord sfword = new SynFWord();
SyncFWord sfword = new SyncFWord();
if (sfword.FindText(base64, this.toolStripTextBox1.Text) == true) { MessageBox.Show(dr[1].ToString()); }
break;
case "XLSM":

View File

@@ -1,4 +1,6 @@
namespace OnDoc.UICintrols
using Syncfusion.Windows.Forms.Tools;
namespace OnDoc.UICintrols
{
partial class DokList
{
@@ -49,6 +51,7 @@
this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton();
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
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();
@@ -56,11 +59,6 @@
this.RibbonTabUserFunctions = new System.Windows.Forms.RibbonTab();
this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonExit = new System.Windows.Forms.RibbonButton();
this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel();
this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton();
this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton();
this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton();
this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton();
this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonNewDoc = new System.Windows.Forms.RibbonButton();
this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton();
@@ -74,11 +72,6 @@
this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonArchivToOnBase = new System.Windows.Forms.RibbonButton();
this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton();
this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel();
this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup();
this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel();
this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonCreateNewPaket = new System.Windows.Forms.RibbonButton();
this.RibbonButtonEditPaket = new System.Windows.Forms.RibbonButton();
@@ -95,6 +88,16 @@
this.ribbonButtonPartnerSuche = new System.Windows.Forms.RibbonButton();
this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup();
this.ribbonLabelMitarbeiter = new System.Windows.Forms.RibbonLabel();
this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel();
this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton();
this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton();
this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton();
this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton();
this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel();
this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup();
this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel();
this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNativ = new System.Windows.Forms.RibbonButton();
this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab();
@@ -104,12 +107,14 @@
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.lblToApprove = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.cbboxMitarbeiter = new Syncfusion.WinForms.ListView.SfComboBox();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -153,9 +158,10 @@
this.zellenwertInZwischenablageKopierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.pDFGenerierenToolStripMenuItem,
this.dokumentAnVersandstrasseToolStripMenuItem});
this.dokumentAnVersandstrasseToolStripMenuItem,
this.wordInterOPEditToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 224);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 268);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -316,6 +322,15 @@
this.splitContainer1.SplitterDistance = 343;
this.splitContainer1.TabIndex = 2;
//
// 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;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -372,6 +387,7 @@
this.ribbon2.Tabs.Add(this.RibbonTabAdmin);
this.ribbon2.TabSpacing = 4;
this.ribbon2.Text = "ribbon2";
this.ribbon2.DockChanged += new System.EventHandler(this.ribbon2_DockChanged);
this.ribbon2.Click += new System.EventHandler(this.ribbon2_Click);
//
// RibbonTabUserFunctions
@@ -408,54 +424,6 @@
this.RibbonButtonExit.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click);
//
// ribbonPanelVorschau
//
this.ribbonPanelVorschau.ButtonMoreVisible = false;
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten);
this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat);
this.ribbonPanelVorschau.Name = "ribbonPanelVorschau";
this.ribbonPanelVorschau.Text = "Vorschau";
//
// RibbonBtnVorschauNo
//
this.RibbonBtnVorschauNo.Image = global::OnDoc.Properties.Resources.Preview_Now_32x32_32;
this.RibbonBtnVorschauNo.LargeImage = global::OnDoc.Properties.Resources.Preview_Now_32x32_32;
this.RibbonBtnVorschauNo.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Large;
this.RibbonBtnVorschauNo.Name = "RibbonBtnVorschauNo";
this.RibbonBtnVorschauNo.SmallImage = global::OnDoc.Properties.Resources.Preview_Now_16x16_32;
this.RibbonBtnVorschauNo.Text = "Keine";
this.RibbonBtnVorschauNo.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.RibbonBtnVorschauNo.Click += new System.EventHandler(this.RibbonBtnVorschauNo_Click);
//
// RibbonBtnVorschauUnten
//
this.RibbonBtnVorschauUnten.Image = global::OnDoc.Properties.Resources.Preview_Unten_32x32_32;
this.RibbonBtnVorschauUnten.LargeImage = global::OnDoc.Properties.Resources.Preview_Unten_32x32_32;
this.RibbonBtnVorschauUnten.Name = "RibbonBtnVorschauUnten";
this.RibbonBtnVorschauUnten.SmallImage = global::OnDoc.Properties.Resources.Preview_Unten_16x16_32;
this.RibbonBtnVorschauUnten.Text = "Unten";
this.RibbonBtnVorschauUnten.Click += new System.EventHandler(this.RibbonBtnVorschauUnten_Click);
//
// RibbonButtonVorschauRechts
//
this.RibbonButtonVorschauRechts.Image = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32;
this.RibbonButtonVorschauRechts.LargeImage = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32;
this.RibbonButtonVorschauRechts.Name = "RibbonButtonVorschauRechts";
this.RibbonButtonVorschauRechts.SmallImage = global::OnDoc.Properties.Resources.Preview_Rechts_16x16_32;
this.RibbonButtonVorschauRechts.Text = "Rechts";
this.RibbonButtonVorschauRechts.Click += new System.EventHandler(this.RibbonButtonVorschauRechts_Click);
//
// RibbonBtnVorschauSepparat
//
this.RibbonBtnVorschauSepparat.Image = global::OnDoc.Properties.Resources.Preview_separated_32x32_32;
this.RibbonBtnVorschauSepparat.LargeImage = global::OnDoc.Properties.Resources.Preview_separated_32x32_32;
this.RibbonBtnVorschauSepparat.Name = "RibbonBtnVorschauSepparat";
this.RibbonBtnVorschauSepparat.SmallImage = global::OnDoc.Properties.Resources.Preview_separated_16x16_32;
this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster";
this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click);
//
// RibbonPanelBearbeiten
//
this.RibbonPanelBearbeiten.ButtonMoreVisible = false;
@@ -573,42 +541,6 @@
this.ribbonButtonVersandstrasse.Text = "Versandstrasse";
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click);
//
// RibbonPanelProfil
//
this.RibbonPanelProfil.ButtonMoreVisible = false;
this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1);
this.RibbonPanelProfil.Items.Add(this.ribbonButton1);
this.RibbonPanelProfil.Name = "RibbonPanelProfil";
this.RibbonPanelProfil.Text = "Profil";
//
// ribbonItemGroup1
//
this.ribbonItemGroup1.Items.Add(this.ribbonLabel1);
this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil);
this.ribbonItemGroup1.Name = "ribbonItemGroup1";
//
// ribbonLabel1
//
this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonLabel1.Name = "ribbonLabel1";
this.ribbonLabel1.Text = "Profil";
//
// RibbonCBProfil
//
this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.RibbonCBProfil.Name = "RibbonCBProfil";
this.RibbonCBProfil.SelectedIndex = -1;
this.RibbonCBProfil.TextBoxText = "";
//
// ribbonButton1
//
this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_32x32_32;
this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Pprofil_32x32_32;
this.ribbonButton1.Name = "ribbonButton1";
this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32;
this.ribbonButton1.Visible = false;
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// RibbonPanelCreate
//
this.RibbonPanelCreate.ButtonMoreVisible = false;
@@ -734,6 +666,90 @@
this.ribbonLabelMitarbeiter.Name = "ribbonLabelMitarbeiter";
this.ribbonLabelMitarbeiter.Text = "Mitarbeiter";
//
// ribbonPanelVorschau
//
this.ribbonPanelVorschau.ButtonMoreVisible = false;
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten);
this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat);
this.ribbonPanelVorschau.Name = "ribbonPanelVorschau";
this.ribbonPanelVorschau.Text = "Vorschau";
//
// RibbonBtnVorschauNo
//
this.RibbonBtnVorschauNo.Image = global::OnDoc.Properties.Resources.Preview_Now_32x32_32;
this.RibbonBtnVorschauNo.LargeImage = global::OnDoc.Properties.Resources.Preview_Now_32x32_32;
this.RibbonBtnVorschauNo.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Large;
this.RibbonBtnVorschauNo.Name = "RibbonBtnVorschauNo";
this.RibbonBtnVorschauNo.SmallImage = global::OnDoc.Properties.Resources.Preview_Now_16x16_32;
this.RibbonBtnVorschauNo.Text = "Keine";
this.RibbonBtnVorschauNo.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.RibbonBtnVorschauNo.Click += new System.EventHandler(this.RibbonBtnVorschauNo_Click);
//
// RibbonBtnVorschauUnten
//
this.RibbonBtnVorschauUnten.Image = global::OnDoc.Properties.Resources.Preview_Unten_32x32_32;
this.RibbonBtnVorschauUnten.LargeImage = global::OnDoc.Properties.Resources.Preview_Unten_32x32_32;
this.RibbonBtnVorschauUnten.Name = "RibbonBtnVorschauUnten";
this.RibbonBtnVorschauUnten.SmallImage = global::OnDoc.Properties.Resources.Preview_Unten_16x16_32;
this.RibbonBtnVorschauUnten.Text = "Unten";
this.RibbonBtnVorschauUnten.Click += new System.EventHandler(this.RibbonBtnVorschauUnten_Click);
//
// RibbonButtonVorschauRechts
//
this.RibbonButtonVorschauRechts.Image = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32;
this.RibbonButtonVorschauRechts.LargeImage = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32;
this.RibbonButtonVorschauRechts.Name = "RibbonButtonVorschauRechts";
this.RibbonButtonVorschauRechts.SmallImage = global::OnDoc.Properties.Resources.Preview_Rechts_16x16_32;
this.RibbonButtonVorschauRechts.Text = "Rechts";
this.RibbonButtonVorschauRechts.Click += new System.EventHandler(this.RibbonButtonVorschauRechts_Click);
//
// RibbonBtnVorschauSepparat
//
this.RibbonBtnVorschauSepparat.Image = global::OnDoc.Properties.Resources.Preview_separated_32x32_32;
this.RibbonBtnVorschauSepparat.LargeImage = global::OnDoc.Properties.Resources.Preview_separated_32x32_32;
this.RibbonBtnVorschauSepparat.Name = "RibbonBtnVorschauSepparat";
this.RibbonBtnVorschauSepparat.SmallImage = global::OnDoc.Properties.Resources.Preview_separated_16x16_32;
this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster";
this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click);
//
// RibbonPanelProfil
//
this.RibbonPanelProfil.ButtonMoreVisible = false;
this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1);
this.RibbonPanelProfil.Items.Add(this.ribbonButton1);
this.RibbonPanelProfil.Name = "RibbonPanelProfil";
this.RibbonPanelProfil.Text = "Profil";
//
// ribbonItemGroup1
//
this.ribbonItemGroup1.Items.Add(this.ribbonLabel1);
this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil);
this.ribbonItemGroup1.Name = "ribbonItemGroup1";
//
// ribbonLabel1
//
this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonLabel1.Name = "ribbonLabel1";
this.ribbonLabel1.Text = "Profil";
//
// RibbonCBProfil
//
this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.RibbonCBProfil.Name = "RibbonCBProfil";
this.RibbonCBProfil.SelectedIndex = -1;
this.RibbonCBProfil.TextBoxText = "";
//
// ribbonButton1
//
this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_32x32_32;
this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Pprofil_32x32_32;
this.ribbonButton1.Name = "ribbonButton1";
this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32;
this.ribbonButton1.Visible = false;
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// ribbonPannelDiverseVorlagen
//
this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ);
@@ -754,6 +770,7 @@
this.RibbonTabAdmin.Name = "RibbonTabAdmin";
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3);
this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses);
this.RibbonTabAdmin.Text = "Administration";
//
// ribbonPanel1
@@ -810,6 +827,21 @@
this.RibbonButtonBerechtigungsgruppe.Text = "Berechtigungsgruppe";
this.RibbonButtonBerechtigungsgruppe.Click += new System.EventHandler(this.RibbonButtonBerechtigungsgruppe_Click);
//
// RibbonPanelDiverses
//
this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK);
this.RibbonPanelDiverses.Name = "RibbonPanelDiverses";
this.RibbonPanelDiverses.Text = "Diverse Funktionen";
//
// ribbonButtonBCK
//
this.ribbonButtonBCK.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonBCK.Image")));
this.ribbonButtonBCK.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonBCK.LargeImage")));
this.ribbonButtonBCK.Name = "ribbonButtonBCK";
this.ribbonButtonBCK.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonBCK.SmallImage")));
this.ribbonButtonBCK.Text = "BCK";
this.ribbonButtonBCK.Click += new System.EventHandler(this.ribbonButton3_Click);
//
// RibbonButtonCreateNewDoc
//
this.RibbonButtonCreateNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32;
@@ -850,14 +882,12 @@
this.cbboxMitarbeiter.TabStop = false;
this.cbboxMitarbeiter.SelectedValueChanged += new System.EventHandler(this.cbboxMitarbeiter_SelectedValueChanged);
//
// docPreview1
// wordInterOPEditToolStripMenuItem
//
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.wordInterOPEditToolStripMenuItem.Name = "wordInterOPEditToolStripMenuItem";
this.wordInterOPEditToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.wordInterOPEditToolStripMenuItem.Text = "Word InterOP Edit";
this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click);
//
// DokList
//
@@ -871,6 +901,7 @@
this.Name = "DokList";
this.Size = new System.Drawing.Size(1709, 847);
this.Load += new System.EventHandler(this.DokList_Load);
this.DockChanged += new System.EventHandler(this.DokList_DockChanged);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.ctxMenuDokList.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
@@ -969,5 +1000,8 @@
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.RibbonButton ribbonButtonRefresh_Bewilligungen;
private Syncfusion.WinForms.ListView.SfComboBox cbboxMitarbeiter;
private System.Windows.Forms.RibbonPanel RibbonPanelDiverses;
private System.Windows.Forms.RibbonButton ribbonButtonBCK;
private System.Windows.Forms.ToolStripMenuItem wordInterOPEditToolStripMenuItem;
}
}

View File

@@ -39,6 +39,8 @@ using BroadcastListener.Classes;
using System.Resources;
using NLog.Config;
using OnDoc.Versandstrasse;
using Windows.UI.Input.Preview.Injection;
using Windows.UI.WebUI;
@@ -48,7 +50,7 @@ namespace OnDoc.UICintrols
{
public int partnernr { get; set; } = 0;
public int forMaNr { get; set; } = 0;
public int docartnr { get; set; }
public int docartnr { get; set; }
public int profilnr { get; set; }
public int mitarbeiternr { get; set; }
@@ -64,26 +66,31 @@ namespace OnDoc.UICintrols
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE");
InitializeComponent();
Broadcaster().AddListener(this);
//Theaming.FormTheaming(ref this);
//t_functions();
pos_elements();
}
public void OnListen(string message, SenderInfo sender)
{
if (sender.SenderName is "PreviewWindow")
{
if (sender.Function == "WindowClosed") {
if (sender.Function == "WindowClosed")
{
this.Separate_Vorschau_offen = false;
}
}
}
private void DokList_Load(object sender, EventArgs e)
{
tsrbvorschau.SelectedIndex = 0;
sfDataGrid1.AllowDraggingColumns = true;
// Helper.Security security = new Helper.Security();
// security.set_security(this);
//Refresh_Bewilligungen();
}
public void load_Profile()
@@ -125,19 +132,19 @@ namespace OnDoc.UICintrols
public void refresh_dokumente()
{
if (datafilter!="")
if (datafilter != "")
{
refresh_dokumente_filtered();
return;
}
DB db = new DB(AppParams.connectionstring);
int selectedIndex = RibbonCBProfil.SelectedIndex;
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
// profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
// profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
System.Data.DataTable dokumente = new System.Data.DataTable();
dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr,forMaNr, false);
dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, false);
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
TableHelper.FormatTable(ref dokumente, "trefferliste_relaunch", ref this.sfDataGrid1);
@@ -181,13 +188,13 @@ namespace OnDoc.UICintrols
selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString();
if (dataRow["Bearbeitung_Zwingend"].ToString() == "1")
{
RibbonButtonArchivToOnBase.Enabled=false;
archivierenToolStripMenuItem.Enabled=false;
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
}
else
{
RibbonButtonArchivToOnBase.Enabled=true;
archivierenToolStripMenuItem.Enabled= true;
RibbonButtonArchivToOnBase.Enabled = true;
archivierenToolStripMenuItem.Enabled = true;
}
}
catch
@@ -256,7 +263,7 @@ namespace OnDoc.UICintrols
}
else
{
Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
}
}
}
@@ -281,7 +288,7 @@ namespace OnDoc.UICintrols
return dok;
}
private void OpenDoc(clsdok dok, bool editdoc)
private void OpenDoc(clsdok dok, bool editdoc, bool interop = false)
{
switch (dok.extension.ToUpper().Substring(0, 1))
@@ -291,7 +298,16 @@ namespace OnDoc.UICintrols
string tempfilename = "";
tempfilename = fh.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
//System.Diagnostics.Process.Start(tempfilename);
System.Diagnostics.Process.Start("winword.exe", "/w "+tempfilename);
if (interop == true)
{
OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid);
WordInterOP.Edit_Document();
WordInterOP = null;
}
else
{
System.Diagnostics.Process.Start("winword.exe", "/w " + tempfilename);
}
if (editdoc == true)
{
@@ -302,8 +318,17 @@ namespace OnDoc.UICintrols
case "X":
clsFileHelper fh2 = new clsFileHelper();
tempfilename = fh2.save_temp_file(dok.dokument, selected_dokumentid, AppParams.tempdir, dok.extension);
//System.Diagnostics.Process.Start(tempfilename);
System.Diagnostics.Process.Start("excel.exe", "/x "+tempfilename);
if (interop == true)
{
OnDocOffice.clsExcelEdit ExcelInterOP = new OnDocOffice.clsExcelEdit(AppParams.connectionstring, tempfilename, selected_dokumentid);
ExcelInterOP.Edit_Document();
ExcelInterOP = null;
}
else
{
System.Diagnostics.Process.Start("excel.exe", " " + tempfilename);
}
//System.Diagnostics.Process.Start("excel.exe", "/x " + tempfilename);
if (editdoc == true)
{
clsProcessWatch.AddToList(selected_dokumentid, tempfilename, "Excel");
@@ -371,7 +396,8 @@ namespace OnDoc.UICintrols
this.splitContainer1.SplitterDistance = this.Height;
this.splitContainer1.Orientation = Orientation.Horizontal;
docPreview1.Visible = false;
if (Separate_Vorschau_offen) {
if (Separate_Vorschau_offen)
{
Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "UpdateView", ""));
}
else
@@ -415,7 +441,7 @@ namespace OnDoc.UICintrols
}
private void RibbonBtnVorschauSepparat_Click(object sender, EventArgs e)
{
if (tsrbvorschau.SelectedIndex==3 && Separate_Vorschau_offen==false)
if (tsrbvorschau.SelectedIndex == 3 && Separate_Vorschau_offen == false)
{
tsrbvorschau_SelectedIndexChanged(sender, e);
return;
@@ -427,7 +453,7 @@ namespace OnDoc.UICintrols
{
createnewdoc(0, 0);
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten=false, string interaktion="Yes",string showdoc="Yes")
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
if (dokumenttypnr == 0)
@@ -455,7 +481,7 @@ namespace OnDoc.UICintrols
}
else
{
frmnewdok.ShowDialog();
frmnewdok.ShowDialog();
}
switch (frmnewdok.DocFunction)
{
@@ -481,62 +507,62 @@ namespace OnDoc.UICintrols
default:
break;
}
}
private void RibbonButtonRefresh_Click(object sender, EventArgs e)
{
refresh_dokumente();
}
private void RibbonButtonEditDelete_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) löschen", "Dokument löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_loeschen(documentid);
}
refresh_dokumente();
}
private void dokument_loeschen(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'");
db.Exec_SQL("Delete from dokument_trefferliste where dokumentid='" + dokumentid + "'");
db = null;
}
private void RibbonButtonRefresh_Click(object sender, EventArgs e)
{
refresh_dokumente();
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
MitarbeiterProfil map = new MitarbeiterProfil(AppParams.CurrentMitarbieter);
map.ShowDialog();
load_Profile();
}
private void RibbonButtonEditDelete_Click(object sender, EventArgs e)
{
private void dokumentLöschenToolStripMenuItem_Click(object sender, EventArgs e)
{
RibbonButtonEditDelete_Click(sender, e);
}
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) löschen", "Dokument löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_loeschen(documentid);
}
refresh_dokumente();
}
private void dokument_loeschen(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'");
db.Exec_SQL("Delete from dokument_trefferliste where dokumentid='" + dokumentid + "'");
db = null;
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
MitarbeiterProfil map = new MitarbeiterProfil(AppParams.CurrentMitarbieter);
map.ShowDialog();
load_Profile();
}
private void dokumentLöschenToolStripMenuItem_Click(object sender, EventArgs e)
{
RibbonButtonEditDelete_Click(sender, e);
}
private void RibbonButtonZuweisen_Click(object sender, EventArgs e)
{
frmDocPreview dpv = new frmDocPreview();
dpv.Show();
}
private void RibbonButtonZuweisen_Click(object sender, EventArgs e)
{
frmDocPreview dpv = new frmDocPreview();
dpv.Show();
}
private void RibbonButtonCreateNewPaket_Click(object sender, EventArgs e)
{
@@ -557,32 +583,32 @@ namespace OnDoc.UICintrols
createnewdoc(0, 0);
}
public void hide_panels()
{
this.RibbonPanelExit.Visible = false;
this.RibbonPanelProfil.Visible=false;
this.RibbonPanelCreate.Visible=false;
this.RibbonPanelProfil.Visible = false;
this.RibbonPanelCreate.Visible = false;
this.RibbonTabAdmin.Visible = false;
this.sfDataGrid1.AllowGrouping=false;
this.sfDataGrid1.ShowGroupDropArea=false;
this.sfDataGrid1.AllowGrouping = false;
this.sfDataGrid1.ShowGroupDropArea = false;
this.lblTitel.Text = "";
this.RibbonButtonNewDoc.Visible=false;
this.RibbonPanelDoklist.Visible=false;
this.RibbonButtonNewDoc.Visible = false;
this.RibbonPanelDoklist.Visible = false;
this.RibbonBtnVorschauNo.Visible = false;
this.RibbonButtonVorschauRechts.Visible=false;
this.RibbonBtnVorschauUnten.Visible=false
this.RibbonButtonVorschauRechts.Visible = false;
this.RibbonBtnVorschauUnten.Visible = false
;
}
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "fileext")
{
try
{
e.Column.CellStyle.HorizontalAlignment= HorizontalAlignment.Center;
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
@@ -591,7 +617,8 @@ namespace OnDoc.UICintrols
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}else
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -645,18 +672,18 @@ namespace OnDoc.UICintrols
clsdok dok = new clsdok("", "", "");
dok = gd.GetDoc(selected_dokumentid);
gd.Print_Doc(dok.dokument);
}
private void RibbonButtonTest1_Click(object sender, EventArgs e)
{
DOCGEN.print print = new DOCGEN.print();
print.printWord();
}
private void ribbonPartnerSuche_Click(object sender, EventArgs e)
@@ -676,7 +703,7 @@ namespace OnDoc.UICintrols
{
if (e.KeyCode == Keys.Enter)
{
this.partnernr= Convert.ToInt32(ribbonTextPartner.TextBoxText.Trim());
this.partnernr = Convert.ToInt32(ribbonTextPartner.TextBoxText.Trim());
refresh_dokumente();
}
}
@@ -689,7 +716,7 @@ namespace OnDoc.UICintrols
private void ribbonButton2_Click(object sender, EventArgs e)
{
Verbindungseditor ve = new Verbindungseditor("Relaunch_Berechtigungsgruppe","Mitarbeiter", "Relaunch_Berechtigungsgruppe_Mitarbeiter");
Verbindungseditor ve = new Verbindungseditor("Relaunch_Berechtigungsgruppe", "Mitarbeiter", "Relaunch_Berechtigungsgruppe_Mitarbeiter");
ve.Show();
}
@@ -727,7 +754,7 @@ namespace OnDoc.UICintrols
private void RibbonButtonArchivToOnBase_Click(object sender, EventArgs e)
{
}
private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
@@ -772,7 +799,7 @@ namespace OnDoc.UICintrols
private void ribbonButtonApproval_Click(object sender, EventArgs e)
{
if (this.lblToApprove.Text=="") { MessageBox.Show("Es sind keine Bewilligungen ausstehend.", "Bewilligung", MessageBoxButtons.OK, MessageBoxIcon.Information);return; }
if (this.lblToApprove.Text == "") { MessageBox.Show("Es sind keine Bewilligungen ausstehend.", "Bewilligung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
frmBewilligung bw = new frmBewilligung();
bw.Show();
}
@@ -780,7 +807,7 @@ namespace OnDoc.UICintrols
private void ribbonButtonToApproval_Click(object sender, EventArgs e)
{
frmToApproval fa = new frmToApproval();
fa.dokumentid=selected_dokumentid;
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
}
@@ -812,14 +839,15 @@ namespace OnDoc.UICintrols
private void ribbon2_Click(object sender, EventArgs e)
{
pos_elements();
if (ribbon2.ActiveTab.Text != "Funktionen")
{
lblToApprove.Visible= false;
cbboxMitarbeiter.Visible= false;
lblToApprove.Visible = false;
cbboxMitarbeiter.Visible = false;
}
else
{
lblToApprove.Visible= true;
lblToApprove.Visible = true;
cbboxMitarbeiter.Visible = true;
}
}
@@ -829,5 +857,54 @@ namespace OnDoc.UICintrols
this.forMaNr = Convert.ToInt32(cbboxMitarbeiter.SelectedValue);
refresh_dokumente();
}
private void pos_elements()
{
System.Windows.Forms.Application.DoEvents();
int posx = ribbonButtonApproval.Bounds.X;
int width = RibbonPannelAproval.Bounds.Width;
if (RibbonPannelAproval.Visible == true && ribbonButtonApproval.Visible == true)
{
//lblToApprove.Visible = true;
lblToApprove.Left = posx + (width / 2);
}
else { lblToApprove.Visible = false; }
posx = ribbonTextPartner.Bounds.X;
cbboxMitarbeiter.Left = posx;
}
private void ribbonButton3_Click(object sender, EventArgs e)
{
BarcodeLib.Barcode bck = new BarcodeLib.Barcode();
bck.Gen_BCK(AppParams.connectionstring);
}
public void set_functions()
{
Security security = new Security();
security.set_security(this);
//pos_elements();
}
private void ribbon2_DockChanged(object sender, EventArgs e)
{
}
private void DokList_DockChanged(object sender, EventArgs e)
{
}
private void wordInterOPEditToolStripMenuItem_Click(object sender, EventArgs e)
{
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
OpenDoc(dok, true,true);
}
}
}

View File

@@ -447,6 +447,24 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonButtonBCK.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonBCK.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonBCK.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -12,7 +12,6 @@ using System.Windows.Forms;
using Helper;
using OnDoc.Helper;
using Syncfusion.WinForms.DataGrid;
using Microsoft.Office.Interop.Word;
using System.Web.UI.WebControls;
using Syncfusion.Data;
using Syncfusion.WinForms.DataGrid.Interactivity;

View File

@@ -222,6 +222,7 @@
this.rbEditlater.TabIndex = 11;
this.rbEditlater.Text = "Dokument später bearbeiten";
this.rbEditlater.UseVisualStyleBackColor = true;
this.rbEditlater.Visible = false;
//
// rbasPDFarchivieren
//

View File

@@ -26,6 +26,7 @@ namespace OnDoc.UIControls
public int partnernr { get; set; }
public bool checkpartner { get; set; } = true;
public clsdocgendata docgendata { get; set; }
public UCAllgemeineDokumentParam()
{
@@ -86,6 +87,11 @@ namespace OnDoc.UIControls
this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
this.cbfaksimile.Checked = false;
this.cbformularohneunterschrfit.Checked = false;
if (dr["Versandstrasse_moeglich"].ToString() == "") { docgendata.versandstrasse_moeglich = false; }
else
{
docgendata.versandstrasse_moeglich = Convert.ToBoolean(dr["Versandstrasse_moeglich"].ToString());
}
if (Convert.ToInt32(dr["Unterschrift_Standard"].ToString()) == 1) { cbfaksimile.Checked = true; }
if (Convert.ToInt32(dr["Unterschrift_Standard"].ToString()) == 2) { cbformularohneunterschrfit.Checked = true; }
@@ -250,6 +256,7 @@ namespace OnDoc.UIControls
if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
//XXXXXdocgendata.dokumentwerte = gridDokwertlist.DataSource;
}