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

updaet 20250123

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-24 16:25:47 +01:00
parent 52a3fecee5
commit 608c67d21b
156 changed files with 2055 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
Client/UIControls/DokList.cs
View File

@@ -51,6 +51,7 @@ using Syncfusion.WinForms.Input;
using Syncfusion.Windows.Forms.CellGrid.ScrollAxis;
using Syncfusion.Windows.Forms.Edit.Utils;
using Syncfusion.WinForms.DataGrid.Serialization;
using NLog.LayoutRenderers;
@@ -77,7 +78,7 @@ namespace OnDoc.UICintrols
//private string currentview { get; set; } = "";
private System.Data.DataRow currentview { get; set; }
//private string paketview { get; set; } = "";
private System.Data.DataRow paketview { get; set; }
@@ -98,12 +99,12 @@ namespace OnDoc.UICintrols
private void datagrid_AutoGeneratingColumn(object sender, AutoGeneratingColumnArgs e)
{
if (e.Column.MappingName=="Erstellt am" || e.Column.MappingName=="Mutiert am")
if (e.Column.MappingName == "Erstellt am" || e.Column.MappingName == "Mutiert am")
{
GridDateTimeColumn gdt = e.Column as GridDateTimeColumn;
gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime;
}
}
public void OnListen(string message, SenderInfo sender)
@@ -149,6 +150,7 @@ namespace OnDoc.UICintrols
if (Convert.ToBoolean(r["standard"]) == true)
{
RibbonCBProfil.SelectedItem = rl;
}
}
db = null;
@@ -161,6 +163,7 @@ namespace OnDoc.UICintrols
db.clear_parameter();
db.add_parameter("@maid", AppParams.CurrentMitarbeiter.ToString());
db.Get_Tabledata("sp_ondoc_get_magridveiw", true, false);
Ansichten = db.dsdaten.Tables[0].Copy();
//string standardview = "";
System.Data.DataRow standardview = null;
@@ -168,10 +171,11 @@ namespace OnDoc.UICintrols
int selindex = 0;
foreach (System.Data.DataRow dr in Ansichten.Rows)
{
RibbonLabel rl = new RibbonLabel();
rl.Text = dr["bezeichnung"].ToString();
rl.Tag = Convert.ToInt32(dr["id"]);
if (Convert.ToInt32(rl.Tag) == -102 && AppParams.isSysadmin)
{
ribbonCBAnsicht.DropDownItems.Add(rl);
@@ -195,6 +199,7 @@ namespace OnDoc.UICintrols
ribbonCBAnsicht.SelectedItem = rl;
selindex = index;
standardview = dr;
currentview = dr;
//standardview = dr["gridsettings"].ToString();
}
if (rl.Text == Bezeichnung)
@@ -205,9 +210,9 @@ namespace OnDoc.UICintrols
}
index = index + 1;
}
if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex-1; }
if (selindex > 0) { ribbonCBAnsicht.SelectedIndex = selindex ; }
db = null;
// if (standardview != "") { refresh_view(standardview); }
// if (standardview != "") { refresh_view(standardview); }
if (standardview != null) { refresh_view(standardview); }
}
@@ -243,11 +248,11 @@ namespace OnDoc.UICintrols
public void refresh_edk_partner(int partnernr)
{
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + partnernr.ToString(),false,true);
db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + partnernr.ToString(), false, true);
Filter_Loeschen();
this.partnernr = partnernr;
RibbonFilterLabel.Text = partnernr + " " + db.dsdaten.Tables[0].Rows[0][0].ToString();
@@ -257,8 +262,8 @@ namespace OnDoc.UICintrols
refresh_dokumente();
}
catch { }
finally { db=null; }
}
finally { db = null; }
}
public void refresh_dokumente(string layout = "")
{
update_currentview();
@@ -334,7 +339,7 @@ namespace OnDoc.UICintrols
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = false;
if (faksimile == "True")
{
ribbonButtonToApproval.Enabled=true;
ribbonButtonToApproval.Enabled = true;
zurUnterschriftenPrüfungToolStripMenuItem.Enabled = true;
}
if (bearbeitung_zwingend == "True")
@@ -368,9 +373,9 @@ namespace OnDoc.UICintrols
if (AppParams.StartApp == false)
{
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
}
}
private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
@@ -456,10 +461,10 @@ namespace OnDoc.UICintrols
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid);
dokument_bearbeiten(documentid, false);
}
}
public void dokument_bearbeiten(string dokid)
public void dokument_bearbeiten(string dokid, bool newdok = false)
{
if (dokid != "") { selected_dokumentid = dokid; }
clsdok dok = GetDoc(false);
@@ -499,7 +504,27 @@ namespace OnDoc.UICintrols
db = null;
}
Logging.DocLog.Info("Dokument bearbeiten", "Doklist", selected_dokumentid, selected_partnernr, "Dokument bearbeiten: InterOP: " + interop.ToString());
OpenDoc(dok, true, interop, runmacros);
if (newdok)
{
OpenDoc(dok, true, interop, runmacros);
}
else
{
Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid);
if (dokbearbeitung.ShowDialog() == DialogResult.Abort)
{
DB db1 = new DB(AppParams.connectionstring);
db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
db1 = null;
}
else
{
OpenDoc(dok, true, interop, runmacros);
};
}
}
private clsdok GetDoc(bool AsPDF)
@@ -570,7 +595,7 @@ namespace OnDoc.UICintrols
//System.Diagnostics.Process.Start(tempfilename);
if (interop == true)
{
OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid,AppParams.RESTURI,AppParams.apikey);
OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid, AppParams.RESTURI, AppParams.apikey);
WordInterOP.Edit_Document(runmacros);
WordInterOP = null;
}
@@ -640,7 +665,7 @@ namespace OnDoc.UICintrols
private void tsrbvorschau_SelectedIndexChanged(object sender, EventArgs e)
{
vorschauposition = tsrbvorschau.Text;
switch (vorschauposition)
{
@@ -662,7 +687,7 @@ namespace OnDoc.UICintrols
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
break;
case "Eigenes Fenster":
this.splitContainer1.SplitterDistance = this.Height;
@@ -710,8 +735,8 @@ namespace OnDoc.UICintrols
currentview["Splitterdistance"] = splitContainer1.SplitterDistance;
MemoryStream ms = new MemoryStream();
//gaga
//this.sfDataGrid1.Serialize(ms);
currentview["Gridsettings"]= Convert.ToBase64String(ms.ToArray());
this.sfDataGrid1.Serialize(ms);
currentview["Gridsettings"] = Convert.ToBase64String(ms.ToArray());
}
private void RibbonBtnVorschauUnten_Click(object sender, EventArgs e)
@@ -793,12 +818,12 @@ namespace OnDoc.UICintrols
Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr);
if (interaktion == "No")
{
frmnewdok.Show();
frmnewdok.Visible = false;
frmnewdok.Dokument_Erstellen();
frmnewdok.Dokument_Erstellen("", false);
frmnewdok.Dispose();
}
else
@@ -812,14 +837,14 @@ namespace OnDoc.UICintrols
case 1:
if (frmnewdok.dokumentid != "")
{
Cursor= Cursors.WaitCursor;
Cursor = Cursors.WaitCursor;
System.Windows.Forms.Application.DoEvents();
selected_dokumentid = frmnewdok.dokumentid;
selected_partnernr = frmnewdok.partnernr.ToString(); ;
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
dokument_bearbeiten(selected_dokumentid);
dokument_bearbeiten(selected_dokumentid, true);
Cursor = Cursors.Default;
System.Windows.Forms.Application.DoEvents();
@@ -850,9 +875,10 @@ namespace OnDoc.UICintrols
db.clear_parameter();
db.add_parameter("@dokumentid", selected_dokumentid);
db.Get_Tabledata("ondoc_check_delete_einzeldokument", true, false);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) {
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
db = null;
return;
return;
}
Logging.Logging.Debug("Doklist Docfunction=6", "Doklist", "");
db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter);
@@ -913,9 +939,9 @@ namespace OnDoc.UICintrols
private void RibbonButtonZuweisen_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu");
InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu","Verantwortlichkeit zuweisen");
ma.ShowDialog();
if (ma.DialogResult == DialogResult.OK)
{
@@ -939,7 +965,7 @@ namespace OnDoc.UICintrols
private void RibbonButtonCreateNewSerienbrief_Click(object sender, EventArgs e)
{
Serienbrief sb = new Serienbrief(this.profilnr);
frmSerienbrief sb = new frmSerienbrief(this.profilnr);
sb.Show();
}
@@ -954,7 +980,7 @@ namespace OnDoc.UICintrols
this.RibbonButtonFavoriten.Visible = false;
this.RibbonPanelSuche.Visible = false;
this.RibbonPannelAproval.Visible = false;
this.RibbonPanelExit.Visible = false;
this.RibbonPanelProfil.Visible = false;
@@ -1021,7 +1047,7 @@ namespace OnDoc.UICintrols
if (e.Column.MappingName == "Termin")
{
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000,1,1))
if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000, 1, 1))
{
e.DisplayText = "";
}
@@ -1259,7 +1285,7 @@ namespace OnDoc.UICintrols
}
}
private void RibbonButtonArchivToOnBase_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
@@ -1278,7 +1304,7 @@ namespace OnDoc.UICintrols
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Status_Bezeichnungnr"]) == -2)
{
MessageBox.Show("Das Dokument " + documentid + " wurde zwischenzeitlich archiviert und kann nicht erneut archiviert werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
@@ -1373,11 +1399,12 @@ namespace OnDoc.UICintrols
if (!row_selected()) return;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count == 1) {
if (records.Count == 1)
{
frmToApproval fa = new frmToApproval();
fa.dokumentid = selected_dokumentid;
fa.ShowDialog();
return;
return;
}
int error = 0;
@@ -1387,31 +1414,34 @@ namespace OnDoc.UICintrols
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "False") { error = 1; }
}
if (error != 0){
if (error != 0)
{
MessageBox.Show("Es sind Dokumente in der Auswahl, welche keine Prüfung benötigten. Bitte auswahl anpassen.", "Prüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
return;
}
if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung "+Environment.NewLine+"(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung " + Environment.NewLine + "(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
frmToApproval fa = new frmToApproval();
fa.Visible = false;
fa.Show();
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
string toapprove = datarow["toapprove"].ToString();
if (toapprove == "True") {
fa.dokumentid = documentid;
fa.update_dokdetails();
fa.insert_bewilligung();
}
if (toapprove == "True")
{
fa.dokumentid = documentid;
fa.update_dokdetails();
fa.insert_bewilligung();
}
}
fa.close_window();
}
refresh_dokumente();
//frmToApproval fa = new frmToApproval();
@@ -1439,6 +1469,19 @@ return;
ribbonLabelToApprove.Text = "";
ribbonLabelToApprove.Visible = false;
}
else
{
ribbonLabelToApprove.Text = db1.dsdaten.Tables[0].Rows[0][0].ToString();
ribbonLabelToApprove.Visible = true;
}
db1.Get_Tabledata("Select count(*) from view_relaunch_approval_serienbrief where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0)
{
ribbonLabelToApprove.Text = "";
ribbonLabelToApprove.Visible = false;
}
else
{
@@ -1534,7 +1577,7 @@ return;
private void ribbonGroupMitarbeiter_Click(object sender, EventArgs e)
{
InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen");
InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen","Mitarbeiter wählen");
ma.ShowDialog();
if (ma.DialogResult == DialogResult.OK)
@@ -1626,7 +1669,7 @@ return;
//private void refresh_view(string base64string)
private void refresh_view(System.Data.DataRow dataRow)
private void refresh_view(System.Data.DataRow dataRow)
{
string base64string = dataRow["gridsettings"].ToString();
@@ -1643,28 +1686,28 @@ return;
return;
}
//currentview = plaintext;
currentview = dataRow;
using (MemoryStream ms = new MemoryStream(bytes))
{
this.sfDataGrid1.Deserialize(ms);
}
sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.FilterRowPosition = RowPosition.Top;
tsrbvorschau.SelectedIndex = Convert.ToInt32(dataRow["Preview"]);
RibbonButtonAttributeEinAusblenden.Checked = Convert.ToInt32(dataRow["Attributes"])==1;
if (tsrbvorschau.SelectedIndex!=0 && Convert.ToInt32(dataRow["SplitterDistance"]) !=0 )
RibbonButtonAttributeEinAusblenden.Checked = Convert.ToInt32(dataRow["Attributes"]) == 1;
if (tsrbvorschau.SelectedIndex != 0 && Convert.ToInt32(dataRow["SplitterDistance"]) != 0)
{
this.splitContainer1.SplitterDistance = Convert.ToInt32(dataRow["SplitterDistance"]);
this.docPreview1.set_zoom();
}
else
{
// docPreview1.clear_viewer();
// docPreview1.clear_viewer();
}
show_hide_attribute();
@@ -1700,7 +1743,7 @@ return;
}
private void ribbonButton4_Click(object sender, EventArgs e)
{
}
@@ -1740,7 +1783,7 @@ return;
sfDataGrid1.ClearSelection();
sfDataGrid1.ClearSorting();
ribbonCBAnsicht.SelectedIndex = 1;
}
private void RibbonButtonViewSave_Click(object sender, EventArgs e)
@@ -1768,13 +1811,13 @@ return;
if (RibbonButtonAttributeEinAusblenden.Checked) { Attribute = 1; }
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard, Preview, Attributes,splitterdistance) values(";
sql = sql + AppParams.CurrentMitarbeiter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString();
sql = sql + ", "+ tsrbvorschau.SelectedIndex.ToString()+", "+Attribute.ToString()+ ", "+distance.ToString()+")";
sql = sql + ", " + tsrbvorschau.SelectedIndex.ToString() + ", " + Attribute.ToString() + ", " + distance.ToString() + ")";
//db.Exec_SQL(sql);
db.Get_Tabledata_for_Update("Select * from mitarbeiter_gridsettings where id = -1", false, true);
System.Data.DataRow dr = db.daten.Tables[0].NewRow();
dr[1]=AppParams.CurrentMitarbeiter.ToString();
dr[2]=DateTime.Now;
dr[1] = AppParams.CurrentMitarbeiter.ToString();
dr[2] = DateTime.Now;
dr[3] = true;
dr[4] = sa.selectedtext;
dr[5] = inputAsString;
@@ -1789,7 +1832,7 @@ return;
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
}
}
@@ -1883,34 +1926,35 @@ return;
}
}
private void attributeAnzeigenVersteckenToolStripMenuItem_Click(object sender, EventArgs e)
private void attributeAnzeigenVersteckenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (RibbonButtonAttributeEinAusblenden.Checked)
{
if (RibbonButtonAttributeEinAusblenden.Checked)
{
RibbonButtonAttributeEinAusblenden.Checked = false;
} else
{
RibbonButtonAttributeEinAusblenden.Checked = true;
}
show_hide_attribute();
update_currentview();
RibbonButtonAttributeEinAusblenden.Checked = false;
}
//if (dokwerte1.Width == 0)
//{
// dokwerte1.Width = 300;
// dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
else
{
RibbonButtonAttributeEinAusblenden.Checked = true;
}
show_hide_attribute();
update_currentview();
}
//if (dokwerte1.Width == 0)
//{
// dokwerte1.Width = 300;
// dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor);
// dokwerte1.Update_Werte(selected_dokumentid);
// RibbonButtonAttributeEinAusblenden.Checked = true;
//}
//else
//{
// dokwerte1.Width = 0;
// RibbonButtonAttributeEinAusblenden.Checked = false;
//}
// dokwerte1.Update_Werte(selected_dokumentid);
// RibbonButtonAttributeEinAusblenden.Checked = true;
//}
//else
//{
// dokwerte1.Width = 0;
// RibbonButtonAttributeEinAusblenden.Checked = false;
//}
private void RibbonButtonAttributeEinAusblenden_Click(object sender, EventArgs e)
{
attributeAnzeigenVersteckenToolStripMenuItem_Click(sender, e);
@@ -2022,7 +2066,7 @@ return;
}
catch { }
}
}
private void sfDataGrid1_FilterChanged(object sender, FilterChangedEventArgs e)
{
@@ -2072,7 +2116,7 @@ return;
string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString();
string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString();
string faksimile = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "faksimile").ToString();
update_ansicht(bearbeitung_zwingend, toapprove, approved,faksimile);
update_ansicht(bearbeitung_zwingend, toapprove, approved, faksimile);
}
}
@@ -2176,7 +2220,7 @@ return;
private void lblToApprove_TextChanged(object sender, EventArgs e)
{
}
private void sfDataGrid1_ColumnResizing(object sender, ColumnResizingEventArgs e)
@@ -2213,7 +2257,7 @@ return;
private void RibbonCBProfil_Click(object sender, EventArgs e)
{
// this.profilnr = Convert.ToInt32(this.RibbonCBProfil.SelectedValue);
// this.profilnr = Convert.ToInt32(this.RibbonCBProfil.SelectedValue);
}
private void RibbonCBProfil_DropDownItemClicked(object sender, System.Windows.Forms.RibbonItemEventArgs e)
@@ -2224,7 +2268,7 @@ return;
private void ctxMenuDokList_Opening(object sender, CancelEventArgs e)
{
if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0)
{
gruppenÖffnenToolStripMenuItem.Visible = true;
@@ -2238,7 +2282,7 @@ return;
toolStripMenuItem3.Visible = false;
}
//var location = this.PointToClient(Cursor.Position);
////System.Drawing.Point location = new System.Drawing.Point();
@@ -2270,7 +2314,7 @@ return;
private void ribbonbuttonnewparterdoc_Click(object sender, EventArgs e)
{
createnewdoc(this.partnernr,0);
createnewdoc(this.partnernr, 0);
}
}