update 20241011

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

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;
}
}
}