update 20241210

This commit is contained in:
Stefan Hutter
2024-12-10 20:36:02 +01:00
parent 8ade484063
commit 2c42687a40
191 changed files with 71919 additions and 482 deletions

View File

@@ -119,7 +119,8 @@ namespace OnDoc.UICintrols
db = null;
refresh_ansichten();
}
private void refresh_ansichten(string Bezeichnung="") {
private void refresh_ansichten(string Bezeichnung = "")
{
ribbonCBAnsicht.DropDownItems.Clear();
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
@@ -133,7 +134,7 @@ namespace OnDoc.UICintrols
rl.Text = dr["bezeichnung"].ToString();
rl.Tag = Convert.ToInt32(dr["id"]);
ribbonCBAnsicht.DropDownItems.Add(rl);
if (Convert.ToBoolean(dr["standard"])==true && Bezeichnung=="")
if (Convert.ToBoolean(dr["standard"]) == true && Bezeichnung == "")
{
ribbonCBAnsicht.SelectedItem = rl;
standardview = dr["gridsettings"].ToString();
@@ -177,7 +178,7 @@ namespace OnDoc.UICintrols
}
catch { }
}
public void refresh_dokumente(string layout="")
public void refresh_dokumente(string layout = "")
{
if (datafilter != "")
{
@@ -193,16 +194,16 @@ namespace OnDoc.UICintrols
System.Data.DataTable dokumente = new System.Data.DataTable();
dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false);
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
if (layout=="") { layout = "trefferliste_relaunch"; }
if (layout == "") { layout = "trefferliste_relaunch"; }
TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1);
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
}
public void refresh_dokumente_filtered(string layout="")
public void refresh_dokumente_filtered(string layout = "")
{
DB db = new DB(AppParams.connectionstring);
int selectedIndex = RibbonCBProfil.SelectedIndex;
@@ -210,7 +211,7 @@ namespace OnDoc.UICintrols
{
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
}
catch
catch
{
load_Profile();
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
@@ -227,7 +228,7 @@ namespace OnDoc.UICintrols
}
private void update_ansicht (string bearbeitung_zwingend, string toApprove, string approved)
private void update_ansicht(string bearbeitung_zwingend, string toApprove, string approved)
{
if (dokwerte1.Width > 0)
{
@@ -276,7 +277,7 @@ namespace OnDoc.UICintrols
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[columnIndex].ToString();
selected_cellvalue=this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
selected_cellvalue = this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
update_ansicht(dataRow["Bearbeitung_Zwingend"].ToString(), dataRow["toapprove"].ToString(), dataRow["approved"].ToString());
return;
@@ -333,10 +334,21 @@ namespace OnDoc.UICintrols
private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
dokument_bearbeiten();
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1) {
if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?","Dokument bearbeiten",MessageBoxButtons.YesNo,MessageBoxIcon.Question) != DialogResult.Yes) { return; }
}
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid);
}
}
public void dokument_bearbeiten()
public void dokument_bearbeiten(string dokid)
{
if (dokid != "") { selected_dokumentid = dokid; }
clsdok dok = GetDoc(false);
if (dok.dokument == "") return;
DB db = new DB(AppParams.connectionstring);
@@ -596,7 +608,7 @@ namespace OnDoc.UICintrols
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
@@ -609,7 +621,7 @@ namespace OnDoc.UICintrols
else { return; }
}
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
@@ -634,7 +646,7 @@ namespace OnDoc.UICintrols
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
dokument_bearbeiten();
dokument_bearbeiten(selected_dokumentid);
}
break;
case 2:
@@ -764,12 +776,12 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Visible = false;
this.sfDataGrid1.ShowGroupDropArea = false;
this.RibbonPannelAnsicht.Visible = false;
}
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
@@ -798,11 +810,12 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
if (dataRow[11].ToString() != "True")
Logging.Logging.Debug("IdonHandler", "OnDocClient", dataRow["dokumentid"].ToString() + Convert.ToString(dataRow["Bearbeitung_Zwingend"]));
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"])== false)
{
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["ToApprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -824,10 +837,10 @@ namespace OnDoc.UICintrols
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (dataRow[11].ToString() != "True")
if (Convert.ToBoolean(dataRow[17]) == true)
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false)
if (Convert.ToBoolean(dataRow["toapprove"]) == true)
{
if (Convert.ToBoolean(dataRow[18]) == true)
if (Convert.ToBoolean(dataRow["approved"]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
@@ -871,11 +884,52 @@ namespace OnDoc.UICintrols
private void druckenToolStripMenuItem_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) drucken", "Dokument drucken", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
print_doc(documentid);
}
Cursor = Cursors.Default;
}
private void print_doc(string dokumentid)
{
DocGet gd = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok("", "", "");
dok = gd.GetDoc(selected_dokumentid);
gd.Print_Doc(dok.dokument);
dok = gd.GetDoc(dokumentid);
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = "";
switch (dok.doktype)
{
case "D":
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
System.IO.File.Delete(Filename);
op = null;
break;
case "X":
System.Diagnostics.Process.Start("winword.exe", "/w " + Filename);
break;
case "P":
DocPreview docPreview = new DocPreview();
docPreview.Show_Doc(dokumentid);
docPreview.printpdf();
docPreview.Dispose();
break;
default:
break;
}
fh = null;
gd = null;
}
private void RibbonButtonTest1_Click(object sender, EventArgs e)
@@ -969,6 +1023,7 @@ namespace OnDoc.UICintrols
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewählte Dokument(e) archiviern und abschliessen", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
@@ -978,6 +1033,7 @@ namespace OnDoc.UICintrols
archivedoc(documentid);
}
Cursor = Cursors.Default;
refresh_dokumente();
// return;
@@ -1069,6 +1125,14 @@ namespace OnDoc.UICintrols
fa.ShowDialog();
}
public void upruefung()
{
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();
}
private void Refresh_Bewilligungen()
{
DB db = new DB(AppParams.connectionstring);
@@ -1145,7 +1209,7 @@ namespace OnDoc.UICintrols
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
{
}
//pos_elements();
}
@@ -1267,7 +1331,7 @@ namespace OnDoc.UICintrols
//tagesdatum = "2024-11-29T00:00:00";
plaintext = plaintext.Replace("@today@", tagesdatum);
plaintext = Strings.Base64Encode(plaintext);
bytes=Convert.FromBase64String(plaintext);
bytes = Convert.FromBase64String(plaintext);
using (MemoryStream ms = new MemoryStream(bytes))
{
this.sfDataGrid1.Deserialize(ms);
@@ -1276,6 +1340,7 @@ namespace OnDoc.UICintrols
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
}
@@ -1358,7 +1423,7 @@ namespace OnDoc.UICintrols
}
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard) values(";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "',"+sa.alsStandard.ToString()+")";
sql = sql + AppParams.CurrentMitarbieter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString() + ")";
db.Exec_SQL(sql);
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
@@ -1373,7 +1438,9 @@ namespace OnDoc.UICintrols
private void RibbonButtonViewDelete_Click(object sender, EventArgs e)
{
if (ribbonCBAnsicht.SelectedItem.Text.Trim()=="" || ribbonCBAnsicht.SelectedItem.Text.Substring(0,4)==" Heu")
string bez = ribbonCBAnsicht.SelectedItem.Text.Trim();
if (bez.Length < 4) { bez = bez + " "; }
if (bez == "" || bez == " Heu")
{
MessageBox.Show("Die gewählte Standard-Ansicht kann nicht gelöscht werden", "Ansicht löschen", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -1399,7 +1466,7 @@ namespace OnDoc.UICintrols
FileHelper fh = new FileHelper();
string b = fh.Base64FromFile(@"x:\gridsettings2.xml");
DB db = new DB(AppParams.connectionstring);
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100");
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
@@ -1428,7 +1495,7 @@ namespace OnDoc.UICintrols
if (dokwerte1.Width == 0)
{
dokwerte1.Width = 300;
dokwerte1.set_panelheight( sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
dokwerte1.Update_Werte(selected_dokumentid);
}
@@ -1454,7 +1521,6 @@ namespace OnDoc.UICintrols
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
@@ -1507,7 +1573,8 @@ namespace OnDoc.UICintrols
selected_dokumentid = "";
selected_partnernr = "";
selected_cellvalue = "";
} else
}
else
{
RibbonButtonEditEditDoc.Enabled = true;
RibbonButtonEditDelete.Enabled = true;
@@ -1528,10 +1595,10 @@ namespace OnDoc.UICintrols
selected_partnernr = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "partner-nr").ToString();
selected_cellvalue = selected_dokumentid;
string bearbeitung_zwingend= sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string bearbeitung_zwingend = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString();
string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString();
string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString();
update_ansicht(bearbeitung_zwingend,toapprove,approved);
update_ansicht(bearbeitung_zwingend, toapprove, approved);
}
}
@@ -1597,6 +1664,12 @@ namespace OnDoc.UICintrols
edk_viewer ev = new edk_viewer();
ev.Show();
}
private void ribbonbuttonedkverarbeitung_Click(object sender, EventArgs e)
{
TableEditor tb = new TableEditor("OnDoc_EDK_Routing");
tb.Show();
}
}
}