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

update 20241011

Browse Source
This commit is contained in:
Stefan Hutter
2024-10-11 21:38:02 +02:00
parent b8a392b514
commit 5bea1d4535
202 changed files with 995 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/UIControls/Approval.cs
View File

@@ -175,7 +175,7 @@ namespace OnDoc.UIControls
}
else
{
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString());
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
db = null;
}

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

@@ -52,7 +52,6 @@ namespace OnDoc.UICintrols
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();
@@ -83,12 +82,10 @@ namespace OnDoc.UICintrols
this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton();
this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel();
this.ribbonGroupPartner = new System.Windows.Forms.RibbonItemGroup();
this.ribbonLabelPartner = new System.Windows.Forms.RibbonLabel();
this.ribbonTextPartner = new System.Windows.Forms.RibbonTextBox();
this.ribbonButtonPartnerSuche = new System.Windows.Forms.RibbonButton();
this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup();
this.ribbonLabelMitarbeiter = new System.Windows.Forms.RibbonLabel();
this.ribbonButtonGetMA = new System.Windows.Forms.RibbonButton();
this.ribbonDokumntID = new System.Windows.Forms.RibbonButton();
this.ribbonButton3 = 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();
@@ -114,7 +111,10 @@ namespace OnDoc.UICintrols
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.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup();
this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel();
this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -123,7 +123,6 @@ namespace OnDoc.UICintrols
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
@@ -329,15 +328,6 @@ namespace OnDoc.UICintrols
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;
@@ -628,50 +618,51 @@ namespace OnDoc.UICintrols
//
// RibbonPanelSuche
//
this.RibbonPanelSuche.Items.Add(this.ribbonGroupPartner);
this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter);
this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter);
this.RibbonPanelSuche.Name = "RibbonPanelSuche";
this.RibbonPanelSuche.Text = "Dokumente suchen";
//
// ribbonGroupPartner
//
this.ribbonGroupPartner.Items.Add(this.ribbonLabelPartner);
this.ribbonGroupPartner.Items.Add(this.ribbonTextPartner);
this.ribbonGroupPartner.Items.Add(this.ribbonButtonPartnerSuche);
this.ribbonGroupPartner.Name = "ribbonGroupPartner";
//
// ribbonLabelPartner
//
this.ribbonLabelPartner.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonLabelPartner.Name = "ribbonLabelPartner";
this.ribbonLabelPartner.Text = "Partner-Nr";
//
// ribbonTextPartner
//
this.ribbonTextPartner.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonTextPartner.Name = "ribbonTextPartner";
this.ribbonTextPartner.TextBoxText = "";
this.ribbonTextPartner.TextBoxKeyDown += new System.Windows.Forms.KeyEventHandler(this.ribbonTextPartnernr_TextBoxKeyDown);
//
// ribbonButtonPartnerSuche
//
this.ribbonButtonPartnerSuche.Image = global::OnDoc.Properties.Resources.save_16x16_32;
this.ribbonButtonPartnerSuche.LargeImage = global::OnDoc.Properties.Resources.save_16x16_32;
this.ribbonButtonPartnerSuche.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonButtonPartnerSuche.Name = "ribbonButtonPartnerSuche";
this.ribbonButtonPartnerSuche.SmallImage = global::OnDoc.Properties.Resources.Search_16x16_32;
this.ribbonButtonPartnerSuche.Click += new System.EventHandler(this.ribbonPartnerSuche_Click);
this.RibbonPanelSuche.Text = "Dokumente suchen/Filter";
//
// ribbonGroupMitarbeiter
//
this.ribbonGroupMitarbeiter.Items.Add(this.ribbonLabelMitarbeiter);
this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA);
this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID);
this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3);
this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter";
this.ribbonGroupMitarbeiter.Text = "";
//
// ribbonLabelMitarbeiter
// ribbonButtonGetMA
//
this.ribbonLabelMitarbeiter.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonLabelMitarbeiter.Name = "ribbonLabelMitarbeiter";
this.ribbonLabelMitarbeiter.Text = "Mitarbeiter";
this.ribbonButtonGetMA.Image = global::OnDoc.Properties.Resources.Pprofil_24x24_32;
this.ribbonButtonGetMA.LargeImage = global::OnDoc.Properties.Resources.Pprofil_24x24_32;
this.ribbonButtonGetMA.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonButtonGetMA.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.ribbonButtonGetMA.Name = "ribbonButtonGetMA";
this.ribbonButtonGetMA.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32;
this.ribbonButtonGetMA.Text = "Mitarbeiter";
this.ribbonButtonGetMA.Click += new System.EventHandler(this.ribbonGroupMitarbeiter_Click);
//
// ribbonDokumntID
//
this.ribbonDokumntID.Image = global::OnDoc.Properties.Resources.Copy_24x24_32;
this.ribbonDokumntID.LargeImage = global::OnDoc.Properties.Resources.Copy_24x24_32;
this.ribbonDokumntID.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonDokumntID.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.ribbonDokumntID.Name = "ribbonDokumntID";
this.ribbonDokumntID.SmallImage = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.ribbonDokumntID.Text = "Dokument-ID";
this.ribbonDokumntID.Click += new System.EventHandler(this.ribbonDokumntID_Click);
//
// ribbonButton3
//
this.ribbonButton3.Image = global::OnDoc.Properties.Resources.Connect_24x24_32;
this.ribbonButton3.LargeImage = global::OnDoc.Properties.Resources.Connect_24x24_32;
this.ribbonButton3.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonButton3.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.ribbonButton3.Name = "ribbonButton3";
this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Connect_16x16_32;
this.ribbonButton3.Text = "Partner";
this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1);
//
// ribbonPanelVorschau
//
@@ -872,26 +863,45 @@ namespace OnDoc.UICintrols
this.timer1.Interval = 60000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// cbboxMitarbeiter
// RibbonGroupFilter
//
this.cbboxMitarbeiter.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxMitarbeiter.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.cbboxMitarbeiter.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxMitarbeiter.Location = new System.Drawing.Point(966, 73);
this.cbboxMitarbeiter.Name = "cbboxMitarbeiter";
this.cbboxMitarbeiter.Size = new System.Drawing.Size(121, 19);
this.cbboxMitarbeiter.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxMitarbeiter.Style.EditorStyle.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.cbboxMitarbeiter.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxMitarbeiter.TabIndex = 7;
this.cbboxMitarbeiter.TabStop = false;
this.cbboxMitarbeiter.SelectedValueChanged += new System.EventHandler(this.cbboxMitarbeiter_SelectedValueChanged);
this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel);
this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete);
this.RibbonGroupFilter.Name = "RibbonGroupFilter";
this.RibbonGroupFilter.Text = "";
//
// RibbonFilterLabel
//
this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.RibbonFilterLabel.Name = "RibbonFilterLabel";
this.RibbonFilterLabel.Text = "";
this.RibbonFilterLabel.ToolTip = "Gewählter Filter";
//
// RibbonFilterDelete
//
this.RibbonFilterDelete.Image = global::OnDoc.Properties.Resources.Remove_24x24_32;
this.RibbonFilterDelete.LargeImage = global::OnDoc.Properties.Resources.Remove_24x24_32;
this.RibbonFilterDelete.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.RibbonFilterDelete.Name = "RibbonFilterDelete";
this.RibbonFilterDelete.SmallImage = global::OnDoc.Properties.Resources.Remove_16x16_32;
this.RibbonFilterDelete.Text = "Filter löschen";
this.RibbonFilterDelete.ToolTip = "Filter löschen";
this.RibbonFilterDelete.Visible = false;
this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click);
//
// 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;
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.cbboxMitarbeiter);
this.Controls.Add(this.lblToApprove);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.panel2);
@@ -910,7 +920,6 @@ namespace OnDoc.UICintrols
this.splitContainer1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -976,12 +985,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel RibbonPanelDemo;
private System.Windows.Forms.RibbonButton RibbonButtonTest1;
private System.Windows.Forms.RibbonPanel RibbonPanelSuche;
private System.Windows.Forms.RibbonItemGroup ribbonGroupPartner;
private System.Windows.Forms.RibbonLabel ribbonLabelPartner;
private System.Windows.Forms.RibbonTextBox ribbonTextPartner;
private System.Windows.Forms.RibbonButton ribbonButtonPartnerSuche;
private System.Windows.Forms.RibbonItemGroup ribbonGroupMitarbeiter;
private System.Windows.Forms.RibbonLabel ribbonLabelMitarbeiter;
private System.Windows.Forms.RibbonPanel ribbonPanel3;
private System.Windows.Forms.RibbonButton RibbonButtonBerechtigungsgruppe;
private System.Windows.Forms.RibbonButton ribbonButton2;
@@ -997,9 +1001,14 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonButton ribbonButtonToApproval;
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;
private System.Windows.Forms.RibbonButton ribbonButtonGetMA;
private System.Windows.Forms.RibbonButton ribbonDokumntID;
private System.Windows.Forms.RibbonButton ribbonButton3;
private System.Windows.Forms.RibbonItemGroup RibbonGroupFilter;
private System.Windows.Forms.RibbonLabel RibbonFilterLabel;
private System.Windows.Forms.RibbonButton RibbonFilterDelete;
}
}

231
Client/UIControls/DokList.cs
View File

@@ -40,6 +40,7 @@ using NLog.Config;
using OnDoc.Versandstrasse;
using Windows.UI.Input.Preview.Injection;
using Windows.UI.WebUI;
using Windows.ApplicationModel.VoiceCommands;
@@ -54,6 +55,7 @@ namespace OnDoc.UICintrols
public int profilnr { get; set; }
public int mitarbeiternr { get; set; }
public string selected_dokumentid { get; set; }
public string selected_partnernr { get; set; }
public string selected_cellvalue { get; set; }
private string vorschauposition = "";
@@ -63,6 +65,8 @@ namespace OnDoc.UICintrols
public bool interop { get; set; } = false;
public bool runmacros { get; set; } = false;
public string Search_Docid { get; set; } = "";
public DokList()
{
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE");
@@ -70,7 +74,7 @@ namespace OnDoc.UICintrols
Broadcaster().AddListener(this);
//t_functions();
pos_elements();
}
public void OnListen(string message, SenderInfo sender)
{
@@ -113,25 +117,33 @@ namespace OnDoc.UICintrols
}
}
}
public void load_Mitarbeiter()
public bool grid_empty()
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
cbboxMitarbeiter.DataSource = db.dsdaten.Tables[0];
cbboxMitarbeiter.DisplayMember = "name";
cbboxMitarbeiter.ValueMember = "mitarbeiternr";
//cbboxMitarbeiter.Left=ribbonTextPartner.
//ribbonComboBoxMitarbeiter.DropDownItems.Clear();
//foreach (System.Data.DataRow r in db.dsdaten.Tables[0].Rows)
//{
// RibbonLabel rl = new RibbonLabel();
// rl.Text = r["name"].ToString();
// rl.Tag = Convert.ToInt32(r["mitarbeiternr"]);
// ribbonComboBoxMitarbeiter.DropDownItems.Add(rl);
//}
if (this.sfDataGrid1.RowCount > 0) { return false; } else return true;
}
public bool row_selected()
{
if (grid_empty() == true) { return false; }
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return false; }
return true;
}
public void delete_doks_in_list()
{
var records = this.sfDataGrid1.View.Records;
foreach (var record in records)
{
var a = record.Data;
var b = a as DataRowView;
string dokumentid = b["dokumentid"].ToString();
dokument_loeschen(dokumentid);
}
}
public void refresh_dokumente()
{
if (datafilter != "")
@@ -146,7 +158,7 @@ namespace OnDoc.UICintrols
// 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, Search_Docid, false);
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
TableHelper.FormatTable(ref dokumente, "trefferliste_relaunch", ref this.sfDataGrid1);
@@ -165,7 +177,7 @@ namespace OnDoc.UICintrols
}
catch { }
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, Search_Docid, false);
dokumente.DefaultView.RowFilter = datafilter;
@@ -187,7 +199,9 @@ namespace OnDoc.UICintrols
var dataRow = (e.DataRow.RowData as DataRowView).Row;
documentid = dataRow["dokumentid"].ToString();
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString();
if (dataRow["Bearbeitung_Zwingend"].ToString() == "1")
{
RibbonButtonArchivToOnBase.Enabled = false;
@@ -195,14 +209,24 @@ namespace OnDoc.UICintrols
}
else
{
RibbonButtonArchivToOnBase.Enabled = true;
archivierenToolStripMenuItem.Enabled = true;
if (dataRow["toapprove"].ToString() == "True" && dataRow["approved"].ToString() =="False")
{
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
}
else
{
RibbonButtonArchivToOnBase.Enabled = true;
archivierenToolStripMenuItem.Enabled = true;
}
}
}
catch
{
selected_dokumentid = "";
selected_partnernr = "";
return;
}
@@ -225,15 +249,34 @@ namespace OnDoc.UICintrols
private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
dokument_bearbeiten();
}
public void dokument_bearbeiten()
{
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
Logging.DocLog.Info("Dokument bearbeiten", "OnDoc.Doklist", selected_dokumentid, "", "Dokument bearbeiten:" + interop.ToString());
OpenDoc(dok, true,interop, runmacros);
DB db = new DB(AppParams.connectionstring);
if (db.Dok_in_Bearbeietung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
{
MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
db.Get_Tabledata("Select * from dokument where dokumentid='" + selected_dokumentid + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["verantwortlich"]) != AppParams.CurrentMitarbieter)
{
if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbieutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
{
db.Exec_SQL("Update dokument set verantwortlich=" + AppParams.CurrentMitarbieter.ToString() + " where dokumentid='" + selected_dokumentid + "'");
Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
}
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
Logging.DocLog.Info("Dokument bearbeiten", "Doklist", selected_dokumentid, selected_partnernr, "Dokument bearbeiten: InterOP: " + interop.ToString());
OpenDoc(dok, true, interop, runmacros);
}
private clsdok GetDoc(bool AsPDF)
@@ -497,6 +540,7 @@ namespace OnDoc.UICintrols
if (frmnewdok.dokumentid != "")
{
selected_dokumentid = frmnewdok.dokumentid;
selected_partnernr = frmnewdok.partnernr.ToString(); ;
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
@@ -543,7 +587,7 @@ namespace OnDoc.UICintrols
refresh_dokumente();
}
private void dokument_loeschen(string dokumentid)
public void dokument_loeschen(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'");
@@ -565,15 +609,18 @@ namespace OnDoc.UICintrols
}
private void RibbonButtonZuweisen_Click(object sender, EventArgs e)
{
frmDocPreview dpv = new frmDocPreview();
dpv.Show();
if (!row_selected()) return;
InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu");
ma.ShowDialog();
if (ma.DialogResult == DialogResult.OK)
{
DB dB = new DB(AppParams.connectionstring);
dB.Exec_SQL("Update dokument set verantwortlich=" + ma.result + " where dokumentid = '" + selected_dokumentid + "'");
dB = null;
Logging.DocLog.Info("Verantwortung zugewiesen auf " + ma.result.ToString(), "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung zugewiesen");
}
}
private void RibbonButtonCreateNewPaket_Click(object sender, EventArgs e)
@@ -601,8 +648,8 @@ namespace OnDoc.UICintrols
this.RibbonButtonFavoriten.Visible = false;
this.RibbonPanelSuche.Visible = false;
this.RibbonPannelAproval.Visible = false;
this.lblToApprove.Visible = false;
this.cbboxMitarbeiter.Visible = false;
this.lblToApprove.Visible = false;
this.RibbonPanelExit.Visible = false;
this.RibbonPanelProfil.Visible = false;
this.RibbonPanelCreate.Visible = false;
@@ -644,7 +691,7 @@ namespace OnDoc.UICintrols
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
@@ -731,27 +778,6 @@ namespace OnDoc.UICintrols
}
private void ribbonPartnerSuche_Click(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.partnernr = ps.partnernr;
this.ribbonTextPartner.Text = this.partnernr.ToString();
refresh_dokumente();
}
}
private void ribbonTextPartnernr_TextBoxKeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
this.partnernr = Convert.ToInt32(ribbonTextPartner.TextBoxText.Trim());
refresh_dokumente();
}
}
private void RibbonButtonBerechtigungsgruppe_Click(object sender, EventArgs e)
{
@@ -844,6 +870,8 @@ namespace OnDoc.UICintrols
private void ribbonButtonApproval_Click(object sender, EventArgs e)
{
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();
@@ -851,6 +879,9 @@ namespace OnDoc.UICintrols
private void ribbonButtonToApproval_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
@@ -888,20 +919,15 @@ namespace OnDoc.UICintrols
if (ribbon2.ActiveTab.Text != "Funktionen")
{
lblToApprove.Visible = false;
cbboxMitarbeiter.Visible = false;
}
else
{
lblToApprove.Visible = true;
cbboxMitarbeiter.Visible = true;
}
}
private void cbboxMitarbeiter_SelectedValueChanged(object sender, EventArgs e)
{
this.forMaNr = Convert.ToInt32(cbboxMitarbeiter.SelectedValue);
refresh_dokumente();
}
private void pos_elements()
{
@@ -914,8 +940,7 @@ namespace OnDoc.UICintrols
lblToApprove.Left = posx + (width / 2);
}
else { lblToApprove.Visible = false; }
posx = ribbonTextPartner.Bounds.X;
cbboxMitarbeiter.Left = posx;
}
private void ribbonButton3_Click(object sender, EventArgs e)
{
@@ -931,25 +956,91 @@ namespace OnDoc.UICintrols
Security security = new Security();
security.set_security(this);
//pos_elements();
security = null;
//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);
OpenDoc(dok, true, true);
}
private void ribbonGroupMitarbeiter_Click(object sender, EventArgs e)
{
InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen");
ma.ShowDialog();
if (ma.DialogResult == DialogResult.OK)
{
Filter_Loeschen();
this.RibbonFilterLabel.Text = ma.resulttext;
this.forMaNr = Convert.ToInt32(ma.result);
RibbonFilterLabel.Visible = true;
RibbonFilterDelete.Visible = true;
refresh_dokumente();
}
}
private void ribbonButton3_Click_1(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
Filter_Loeschen();
this.partnernr = ps.partnernr;
RibbonFilterLabel.Text = ps.partnernr + " " + ps.partnerkurzname;
RibbonFilterLabel.Visible = true;
RibbonFilterDelete.Visible = true;
refresh_dokumente();
}
}
private void ribbonDokumntID_Click(object sender, EventArgs e)
{
InputDialog dokid = new InputDialog("Dokument-ID", "Gesuchte Dokument-ID", "");
dokid.ShowDialog();
if (dokid.DialogResult == DialogResult.OK)
{
Filter_Loeschen();
Search_Docid = dokid.result;
RibbonFilterLabel.Text = dokid.result;
RibbonFilterLabel.Visible = true;
RibbonFilterDelete.Visible = true;
refresh_dokumente();
}
}
private void RibbonFilterDelete_Click(object sender, EventArgs e)
{
Filter_Loeschen();
refresh_dokumente();
}
private void Filter_Loeschen()
{
this.partnernr = 0;
this.forMaNr = 0;
this.Search_Docid = "";
this.RibbonFilterLabel.Visible = false;
this.RibbonFilterLabel.Text = "";
RibbonFilterDelete.Visible = false;
}
}
}

1
Client/UIControls/Partnersuche.Designer.cs generated
View File

@@ -112,6 +112,7 @@
//
// sfButton1
//
this.sfButton1.Enabled = false;
this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
this.sfButton1.Location = new System.Drawing.Point(394, 343);
this.sfButton1.Name = "sfButton1";

7
Client/UIControls/Partnersuche.cs
View File

@@ -32,6 +32,7 @@ namespace OnDoc.UIControls
private void Form1_Load(object sender, EventArgs e)
{
this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y);
trefferlistedata.DataSource = clsPartner.get_partnerliste();
try
{
@@ -69,6 +70,12 @@ namespace OnDoc.UIControls
catch { }
}
catch { }
try
{
if (trefferlistedata.View.Records.Count > 0) sfButton1.Enabled = true; else sfButton1.Enabled = false;
}
catch { sfButton1.Enabled=false; }
}

16
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -71,6 +71,7 @@
this.lblDokumentDatum = new System.Windows.Forms.Label();
this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox();
this.lblPostzustellung = new System.Windows.Forms.Label();
this.btnErneutGenerierung = new System.Windows.Forms.Button();
this.GrpPartner.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
@@ -254,7 +255,7 @@
this.gridDokwertlist.Size = new System.Drawing.Size(456, 376);
this.gridDokwertlist.TabIndex = 0;
this.gridDokwertlist.Text = "sfDataGrid1";
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick);
this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
//
// lblBezeichnung
@@ -562,10 +563,22 @@
this.lblPostzustellung.TabIndex = 0;
this.lblPostzustellung.Text = "Postzustellung";
//
// btnErneutGenerierung
//
this.btnErneutGenerierung.Location = new System.Drawing.Point(900, 64);
this.btnErneutGenerierung.Name = "btnErneutGenerierung";
this.btnErneutGenerierung.Size = new System.Drawing.Size(138, 23);
this.btnErneutGenerierung.TabIndex = 25;
this.btnErneutGenerierung.Text = "Erneut generieren";
this.btnErneutGenerierung.UseVisualStyleBackColor = true;
this.btnErneutGenerierung.Visible = false;
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
//
// UCAllgemeineDokumentParam
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.btnErneutGenerierung);
this.Controls.Add(this.GrpInhalt);
this.Controls.Add(this.GrpVerwendung);
this.Controls.Add(this.GrpSpezifischeWerte);
@@ -654,5 +667,6 @@
private System.Windows.Forms.Label lblPostzustellung;
private System.Windows.Forms.TextBox txtPartnerZusteller;
private System.Windows.Forms.TextBox txtPartnerInhaber;
private System.Windows.Forms.Button btnErneutGenerierung;
}
}

26
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -42,7 +42,8 @@ namespace OnDoc.UIControls
public bool personendokument { get; set; } = false;
public string uniqid { get; set; } = Guid.NewGuid().ToString();
public bool ausDokumentpaket { get; set; } = false;
public string genertated_dokumentid { get; set; }
public UCAllgemeineDokumentParam()
{
@@ -531,25 +532,14 @@ namespace OnDoc.UIControls
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
private void btnErneutGenerierung_Click(object sender, EventArgs e)
{
try
{
if (e.DataColumn.Index == 15)
{
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
string datenherkunft = dataRow["datenherkunft"].ToString();
string feldtyp = dataRow["feldtyp"].ToString();
if (datenherkunft != "")
{
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
}
}
}
catch { }
Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "NeuGenerierung", genertated_dokumentid));
}
public void Show_Neugenerieren()
{
btnErneutGenerierung.Visible = true;
}
}
}