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

update 20250317

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-18 06:37:31 +01:00
parent 238e592ec8
commit 7e3381c926
280 changed files with 2730906 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,7 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab();
this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton();
this.ribbonbtnqdf = new System.Windows.Forms.RibbonButton();
this.ribbonAnmelden = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
this.ribbonVorlagen = new System.Windows.Forms.RibbonPanel();
@@ -166,9 +167,9 @@ namespace OnDoc.UICintrols
this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components);
this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -481,6 +482,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(1709, 343);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.ValidationMode = Syncfusion.WinForms.DataGrid.Enums.GridValidationMode.InView;
this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1);
this.sfDataGrid1.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGrid1_DrawCell);
this.sfDataGrid1.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.sfDataGrid1_SelectionChanged);
@@ -749,7 +751,6 @@ namespace OnDoc.UICintrols
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32;
this.ribbonButtonVersandstrasse.Text = "Versandstrasse";
this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click);
//
// RibbonPanelDemo
@@ -1199,6 +1200,7 @@ namespace OnDoc.UICintrols
//
this.RibbonPanelDiverses.ButtonMoreVisible = false;
this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK);
this.RibbonPanelDiverses.Items.Add(this.ribbonbtnqdf);
this.RibbonPanelDiverses.Name = "RibbonPanelDiverses";
this.RibbonPanelDiverses.Text = "Diverse Funktionen";
//
@@ -1211,6 +1213,15 @@ namespace OnDoc.UICintrols
this.ribbonButtonBCK.Text = "BCK";
this.ribbonButtonBCK.Click += new System.EventHandler(this.ribbonButton3_Click);
//
// ribbonbtnqdf
//
this.ribbonbtnqdf.Image = global::OnDoc.Properties.Resources.QDF_32x32_32;
this.ribbonbtnqdf.LargeImage = global::OnDoc.Properties.Resources.QDF_32x32_32;
this.ribbonbtnqdf.Name = "ribbonbtnqdf";
this.ribbonbtnqdf.SmallImage = global::OnDoc.Properties.Resources.QDF_24x24_32;
this.ribbonbtnqdf.Text = "Log";
this.ribbonbtnqdf.Click += new System.EventHandler(this.ribbonbtnqdf_Click);
//
// ribbonAnmelden
//
this.ribbonAnmelden.ButtonMoreVisible = false;
@@ -1385,6 +1396,14 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click);
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 153);
this.dokwerte1.Name = "dokwerte1";
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// RibbonButtonCreateNewDoc
//
this.RibbonButtonCreateNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32;
@@ -1402,14 +1421,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 153);
this.dokwerte1.Name = "dokwerte1";
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1575,5 +1586,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanel4;
private System.Windows.Forms.RibbonButton ribbonButtonDokinBearbeitung;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
private System.Windows.Forms.RibbonButton ribbonbtnqdf;
}
}

45
Client/UIControls/DokList.cs
View File

@@ -940,6 +940,15 @@ namespace OnDoc.UICintrols
Dokumentpaket dp = new Dokumentpaket(dokumentpaketnr, partnernr, this.profilnr);
dp.Show();
}
public void createsb(int dokumenttypnr)
{
frmSerienbrief sb = new frmSerienbrief(this.profilnr);
sb.Show();
sb.create_new_sb(dokumenttypnr);
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
@@ -1173,7 +1182,7 @@ namespace OnDoc.UICintrols
this.RibbonButtonVorschauRechts.Visible = false;
this.RibbonBtnVorschauUnten.Visible = false;
this.ribbonTabDokpaket_Serienbrief.Visible = false;
this.ribbonButtonVersandstrasse.Visible = false;
//this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonTabDokpaket_Serienbrief.Visible = false;
this.ribbonTabProfil.Visible = false;
this.RibbonTabNativVorlagen.Visible = false;
@@ -1490,8 +1499,6 @@ namespace OnDoc.UICintrols
Cursor = Cursors.WaitCursor;
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
db.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='" + documentid + "'", false, true);
@@ -1502,7 +1509,29 @@ namespace OnDoc.UICintrols
}
else
{
archivedoc(documentid);
int res = db.Dok_in_Bearbeitung(3, documentid, AppParams.CurrentMitarbeiter);
switch (res)
{
case 0:
archivedoc(documentid);
break;
case 1:
if (MessageBox.Show("Das Dokument wird aktuell bearbeitet." + Environment.NewLine + Environment.NewLine + "Sperrung aufheben?" + Environment.NewLine + Environment.NewLine + "Bitte vorgängig prüfen, ob das Dokument nicht mehr in Word/Excel geöffnet ist und die korrekte Version zur Archivierung bereit steht (Vorschau/Anzeige)!", "Dokumentsperrung aufheben", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
clsProcessWatch.RemoveFromList(documentid);
archivedoc(documentid);
}
else
{
return;
}
break;
case 2:
MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
break;
}
//archivedoc(documentid);
}
}
db = null;
@@ -1732,7 +1761,7 @@ namespace OnDoc.UICintrols
{
Security security = new Security();
security.set_security(this);
security.set_security_general(this);
security = null;
ribbonVorlagen.Visible = AppParams.isSysadmin;
ribbonBerechtigung.Visible = AppParams.isSysadmin;
@@ -2637,7 +2666,11 @@ namespace OnDoc.UICintrols
te.Show();
}
private void ribbonbtnqdf_Click(object sender, EventArgs e)
{
qdfLog ql = new qdfLog();
ql.Show();
}
}

95
Client/UIControls/Serienbrief.cs
View File

@@ -566,6 +566,44 @@ namespace OnDoc.UIControls
//System.IO.File.Delete(filename);
}
public void create_new_sb(int dokumenttypnr)
{
try
{
panelLoad.Visible = true;
System.Windows.Forms.Application.DoEvents();
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(-1);
//this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
sb.verantwortlich = AppParams.CurrentMitarbeiter;
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
update_serienbriefdaten(true);
vorlage_auslesen_und_speichern();
SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb);
sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy());
sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder";
Logging.Logging.Debug("Update Serienbriefdaten", "OnDoc", "");
update_serienbriefdaten(false);
open_sb(sb.serienbriefnr);
treeViewAdv1.Enabled = true;
panelLoad.Visible = false;
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
}
catch (Exception ex)
{
panelLoad.Visible = false;
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
private void RibbonButtonNew_Click(object sender, EventArgs e)
{
@@ -574,6 +612,9 @@ namespace OnDoc.UIControls
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
create_new_sb(DokTypSelect.dokumenttypnr);
return;
try
{
panelLoad.Visible = true;
@@ -1173,6 +1214,8 @@ namespace OnDoc.UIControls
dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString();
}
db.Get_Tabledata("select dbo.fnkt_check_blkunde(" + ipartnernr.ToString() + ")", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])>0) { dr["BLKUNDE"] = "1"; } else { dr["BLKUNDE"] = "0"; }
dr["STATUS"] = 0;
dr["FEHLERCODE"] = 0;
dr["IntEintragnr"] = lastid;
@@ -2608,36 +2651,40 @@ namespace OnDoc.UIControls
private void sfdatagridsbload_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e)
{
if (e.Column.MappingName == "S")
try
{
try
if (e.Column.MappingName == "S")
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
try
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToInt32(dataRow["S"]) == 0)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToInt32(dataRow["S"]) == 1)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToInt32(dataRow["S"]) == 2)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
Pen borderPen = new Pen(Color.LightGray);
e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom);
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
if (Convert.ToInt32(dataRow["S"]) == 0)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToInt32(dataRow["S"]) == 1)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToInt32(dataRow["S"]) == 2)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
Pen borderPen = new Pen(Color.LightGray);
e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom);
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
}
catch { }
e.Handled = false;
}
catch { }
e.Handled = false;
}
catch { }
}