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

2
Client/UIControls/Administrator/Dokumenttyp.Designer.cs generated
View File

@@ -881,7 +881,7 @@
this.tabPageAdv2.Name = "tabPageAdv2";
this.tabPageAdv2.ShowCloseButton = true;
this.tabPageAdv2.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv2.Text = "Voralgenfelder";
this.tabPageAdv2.Text = "Vorlagenfelder";
this.tabPageAdv2.ThemesEnabled = false;
//
// splitContainer1

5
Client/UIControls/Approval.cs
View File

@@ -136,8 +136,13 @@ namespace OnDoc.UIControls
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
}
public int anzahl_dokument()
{
return treeViewAdv1.Nodes.Count;
}
private void ribbonButtonNotApproved_Click(object sender, EventArgs e)
{
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(),"Ablehnen");

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

@@ -97,6 +97,7 @@ namespace OnDoc.UICintrols
this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel();
this.RibbonPartnerSaldiert = new System.Windows.Forms.RibbonButton();
this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton();
this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton();
this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNativ = new System.Windows.Forms.RibbonButton();
this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel();
@@ -162,7 +163,6 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -815,6 +815,16 @@ namespace OnDoc.UICintrols
this.RibbonFilterDelete.Visible = false;
this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click);
//
// ribbonbuttonnewparterdoc
//
this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32;
this.ribbonbuttonnewparterdoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_24x24_32;
this.ribbonbuttonnewparterdoc.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonbuttonnewparterdoc.Name = "ribbonbuttonnewparterdoc";
this.ribbonbuttonnewparterdoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.ribbonbuttonnewparterdoc.Visible = false;
this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click);
//
// ribbonPannelDiverseVorlagen
//
this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ);
@@ -1343,16 +1353,6 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// ribbonbuttonnewparterdoc
//
this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32;
this.ribbonbuttonnewparterdoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_24x24_32;
this.ribbonbuttonnewparterdoc.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonbuttonnewparterdoc.Name = "ribbonbuttonnewparterdoc";
this.ribbonbuttonnewparterdoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.ribbonbuttonnewparterdoc.Visible = false;
this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

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

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

@@ -58,9 +58,9 @@
this.lblPartnerNr.AutoSize = true;
this.lblPartnerNr.Location = new System.Drawing.Point(12, 26);
this.lblPartnerNr.Name = "lblPartnerNr";
this.lblPartnerNr.Size = new System.Drawing.Size(55, 13);
this.lblPartnerNr.Size = new System.Drawing.Size(61, 13);
this.lblPartnerNr.TabIndex = 0;
this.lblPartnerNr.Text = "Partner-Nr";
this.lblPartnerNr.Text = "Kunden-Nr.";
//
// lblkurzname
//
@@ -211,10 +211,10 @@
// btnbpperson
//
this.btnbpperson.Enabled = false;
this.btnbpperson.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32;
this.btnbpperson.Location = new System.Drawing.Point(555, 132);
this.btnbpperson.Image = ((System.Drawing.Image)(resources.GetObject("btnbpperson.Image")));
this.btnbpperson.Location = new System.Drawing.Point(551, 132);
this.btnbpperson.Name = "btnbpperson";
this.btnbpperson.Size = new System.Drawing.Size(24, 27);
this.btnbpperson.Size = new System.Drawing.Size(34, 34);
this.btnbpperson.TabIndex = 11;
this.btnbpperson.UseVisualStyleBackColor = true;
this.btnbpperson.Click += new System.EventHandler(this.btnbpperson_Click);
@@ -223,7 +223,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(583, 399);
this.ClientSize = new System.Drawing.Size(584, 399);
this.Controls.Add(this.btnbpperson);
this.Controls.Add(this.chkkeepalive);
this.Controls.Add(this.label1);

19
Client/UIControls/Partnersuche.cs
View File

@@ -95,14 +95,14 @@ namespace OnDoc.UIControls
catch { }
this.Text = "Kunde suchen";
this.lblPartnerNr.Text = "Kunde-Nr";
if (personendokument) {
this.Text = "Person suchen";
this.lblPartnerNr.Text = "Person-Nr.";
}
if (bpdokument) {
this.Text = "Partner suchen";
this.lblPartnerNr.Text = "Partner-Nr.";
}
//if (personendokument) {
// this.Text = "Person suchen";
// this.lblPartnerNr.Text = "Person-Nr.";
//}
//if (bpdokument) {
// this.Text = "Partner suchen";
// this.lblPartnerNr.Text = "Partner-Nr.";
//}
}
private void btnsuche_Click(object sender, EventArgs e)
@@ -116,6 +116,7 @@ namespace OnDoc.UIControls
{
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0,personendokument,bpdokument, chksaldiert.Checked);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
trefferlistedata.Columns[0].HeaderText = "Kunden-Nr.";
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
@@ -135,6 +136,8 @@ namespace OnDoc.UIControls
string s = txtKurzname.Text.Trim();
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1, personendokument, bpdokument, chksaldiert.Checked);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
trefferlistedata.Columns[0].HeaderText = "Kunden-Nr.";
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;

18
Client/UIControls/Partnersuche.resx
View File

@@ -120,10 +120,26 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnbpperson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAJDSURBVEhLtZXPSxtREMfX2FaUpK3a+AMJNkpCUCOCp1bwUJAWD2JpD6WX2vbqLZoU601Fz62H
erIlgngXhNJehNwKhSL+GR4U/EE02/m83bftrlF4i/nCkJdh9vvdmXkzawXQKTYr9lHsg6HxDM/CURUv
xGbEYupfOETF4IDLBxyTzvFGAJcnQkqo3jTgVOWibqQWRDo5+HS3Z2i8JOd+x+VDROyl2HOxOhwBUGq4
VXMuoTHauphbPy3PfiufN3ekVl23RkR8X17P7x6+mvt5dPdB9yfxVRNR3NyAS4i1JFbyxYqNJQefbbpu
UC/ka+9X9s4KG7aNvV36feqKkNX/UNwmAry5Qy7+QtG28xv8VuwpEbnf1hsUMRO43RDNvVv+c1KAVBkZ
/Du/Wfh1fOtO07QicGAm0NKZWcsXLyq59ZPyo4m5A12i7OjU/szXs3Pp14Vk8VkRODATEAw8HBj70ZUe
2U5kRku6RI2x+Jb83+nue/JdYjJOqIKxgIfU8OSmLhGxrjuI6wV4Q6znWgHbSCBDmqTbJGmrGyIEXanH
JcpCeSQmS2AoARpEo2gYjdNXkYbSWBpMo4kNJcAV46rp0gSNK8pVJTZsiSIMiwyNmlJdIozhYsiIITCs
AIgw9jL+3rQq8nZFXu+EmAlUW3Z1iMgiO5SFdnQvnvTeXCOeyK6yCFmILEbXHYTivmpdsx1Zxazk4BID
/axyVrqc047LB29d1+qD4/s+1/STqYED1Zp89DVICRGaww0wMZ7xlcWyLOsvDFd8XAJMOgUAAAAASUVO
RK5CYII=
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>172, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

1451
Client/UIControls/Serienbrief.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

2437
Client/UIControls/Serienbrief.cs Normal file
View File

File diff suppressed because it is too large Load Diff

136
Client/UIControls/Serienbrief.resx Normal file
View File

@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ctxmenuEmpfaenger.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>156, 17</value>
</metadata>
<metadata name="ctxmenutree.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ribbonbuttonsavetemplate.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

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

@@ -607,7 +607,7 @@
// DateDokumentDatum
//
this.DateDokumentDatum.DateTimeIcon = null;
this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44);
this.DateDokumentDatum.Location = new System.Drawing.Point(151, 43);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
this.DateDokumentDatum.TabIndex = 3;

112
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -68,6 +68,8 @@ namespace OnDoc.UIControls
public bool FillOffice = false;
public string CompatibilityMode = "";
public string dokumentid { get; set; } = "";
public UCAllgemeineDokumentParam()
{
@@ -263,7 +265,7 @@ namespace OnDoc.UIControls
{
}
Logging.Logging.Debug("Profilnr", "OnDOc", profilnr.ToString());
Logging.Logging.Debug("Profilnr", "OnDoc", profilnr.ToString());
if (profilnr != 0)
{
@@ -290,8 +292,26 @@ namespace OnDoc.UIControls
}
}
if (dokumentid == "")
{
Get_DokWertList(ref db, "", 1);
}
db = null;
Refresh_Team();
try
{
this.cbboxteam.SelectedIndex = 0;
}
catch { }
}
private void Get_DokWertList(ref DB db, string dokumentid, int createnew)
{
System.Data.DataTable dokwertlist = new System.Data.DataTable();
dokwertlist = db.Get_DokumentWertList("", dokumenttypnr);
dokwertlist = db.Get_DokumentWertList(dokumentid, dokumenttypnr, createnew);
if (EDK_Data.toexecute == true)
{
//db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + EDK_Data.verantwortlich + "'", false, true);
@@ -307,7 +327,7 @@ namespace OnDoc.UIControls
}
dokwertlist.AcceptChanges();
}
gridDokwertlist.DataSource = dokwertlist;
for (int i = 3; i < gridDokwertlist.Columns.Count; i++)
@@ -322,17 +342,10 @@ namespace OnDoc.UIControls
gridDokwertlist.Columns.Add(new GridImageColumn() { MappingName = "S", ImageLayout = ImageLayout.Center });
gridDokwertlist.Columns["S"].Width = 25;
gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle;
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true });
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType = Syncfusion.Data.FilterType.Equals, FilterValue = true });
gridDokwertlist.View.RecordPropertyChanged += OnRecordPropertyChanged;
db = null;
Refresh_Team();
try
{
this.cbboxteam.SelectedIndex = 0;
}
catch { }
}
private void OnRecordPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -626,6 +639,8 @@ namespace OnDoc.UIControls
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
}
@@ -691,6 +706,42 @@ namespace OnDoc.UIControls
dokdata.anrede = docgendata.anrede;
dokdata.barcode_zusatz = barcode_zusatz;
if (cbfaksimile.Checked)
{
dokdata.approval1 = 0;
dokdata.approval2 = 0;
try
{
if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; }
else
{
if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftlinks.SelectedValue.ToString()))
{
dokdata.approval1 = 1;
}
}
}
catch { }
try
{
if (cbboxunterschriftrechts.Text == "") { dokdata.approval2 = 1; }
else
{
if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftrechts.SelectedValue.ToString()))
{
dokdata.approval2 = 1;
}
}
}
catch { }
if (dokdata.approval1 == 1 && dokdata.approval2 == 1 )
{
dokdata.approved = 1;
}
}
}
private void sfButton1_Click(object sender, EventArgs e)
{
@@ -936,7 +987,6 @@ namespace OnDoc.UIControls
{
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -958,6 +1008,44 @@ namespace OnDoc.UIControls
catch { }
}
public void load_doc()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + this.dokumentid+"'", false, true);
System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0];
this.partnernr = Convert.ToInt32(dr["nrpar00"]);
this.dokumenttypnr = Convert.ToInt32(dr["dokumenttypnr"]);
Refresh_Details();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.cbboxunterschriftlinks.SelectedValue= Convert.ToInt32(dr["unterschriftlinks"]);
this.cbboxunterschriftrechts.SelectedValue = Convert.ToInt32(dr["unterschriftrechts"]);
if (Convert.ToInt32(dr["zustaendig_kube"]) > 0)
{
rbzustaendigkube.Checked = true;
rbzustaendigmitarbeiter.Checked = false;
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendig_kube"]);
} else
{
rbzustaendigmitarbeiter.Checked = true;
rbzustaendigkube.Checked = false;
cbboxzustaendigmitarbeiter.SelectedValue = Convert.ToInt32(dr["zustaendiger"]);
}
this.txtbezeichnung.Text = dr["bezeichnung"].ToString();
this.cbboxverantwortlich.SelectedValue = Convert.ToInt32(dr["verantwortlich"]);
this.txtanrede.Text = dr["anredezustelladresse"].ToString();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.DateDokumentDatum.Value = Convert.ToDateTime(dr["erstellungsdatum"]);
this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString();
if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString();
Get_DokWertList(ref db, dokumentid, 0);
db = null;
}
}
}