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

update 20241217

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-17 20:48:07 +01:00
parent 8f74cec1ab
commit 7e891afc23
108 changed files with 686 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Client/UIControls/DocPreview.cs
View File

@@ -21,6 +21,7 @@ namespace OnDoc.UIControls
{
public partial class DocPreview : UserControl
{
string PrintDokID = "";
public int ZoomPercentage { get; set; }
public DocPreview()
{
@@ -51,6 +52,7 @@ namespace OnDoc.UIControls
}
public void Show_Doc(string dokumentid)
{
PrintDokID= dokumentid;
clsdok dok = new clsdok("", "", "");
if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
@@ -70,8 +72,9 @@ namespace OnDoc.UIControls
}
}
public void show_base64(string image)
public void show_base64(string image,string Logtext)
{
PrintDokID = "Vorschau Vorlage: " + Logtext; ;
var stream = new MemoryStream(Convert.FromBase64String(image));
if (stream.Length > 0)
{
@@ -98,6 +101,7 @@ namespace OnDoc.UIControls
var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
if (stream.Length > 0)
{
PrintDokID = "Serienbrief: Nr:" + Serienbriefnr.ToString() + " / " + dokumentid.ToString();
this.pdfViewerControl1.Load(stream);
this.pdfViewerControl1.Visible = true;
pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
@@ -283,11 +287,13 @@ namespace OnDoc.UIControls
private void toolStripButton1_Click(object sender, EventArgs e)
{
pdfViewerControl1.Print(true);
Logging.DocLog.Info("Preview gedruckt", "OnDoc", PrintDokID,"","");
}
public void printpdf()
{
pdfViewerControl1.Print(true);
Logging.DocLog.Info("Preview gedruckt", "OnDoc", PrintDokID, "", "");
}
}
}

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

@@ -38,16 +38,17 @@ namespace OnDoc.UICintrols
this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vertragPDFDEMOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.zellenwertInZwischenablageKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pDFGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox();
@@ -182,6 +183,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.FilterChanged += new Syncfusion.WinForms.DataGrid.Events.FilterChangedEventHandler(this.sfDataGrid1_FilterChanged);
this.sfDataGrid1.DataSourceChanged += new Syncfusion.WinForms.DataGrid.Events.DataSourceChangedEventHandler(this.sfDataGrid1_DataSourceChanged);
this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
this.sfDataGrid1.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellDoubleClick);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// ctxMenuDokList
@@ -191,18 +193,19 @@ namespace OnDoc.UICintrols
this.dokumentBearbeitenToolStripMenuItem,
this.dokumentLöschenToolStripMenuItem,
this.archivierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem,
this.toolStripMenuItem1,
this.barcodeDemoToolStripMenuItem,
this.vertragPDFDEMOToolStripMenuItem,
this.zellenwertInZwischenablageKopierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.pDFGenerierenToolStripMenuItem,
this.dokumentAnVersandstrasseToolStripMenuItem,
this.wordInterOPEditToolStripMenuItem,
this.attributeAnzeigenVersteckenToolStripMenuItem,
this.historyToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem});
this.historyToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 312);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 318);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -236,6 +239,27 @@ namespace OnDoc.UICintrols
this.archivierenToolStripMenuItem.Text = "Archivieren";
this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click);
//
// druckenToolStripMenuItem
//
this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32;
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(276, 6);
//
// barcodeDemoToolStripMenuItem
//
this.barcodeDemoToolStripMenuItem.Name = "barcodeDemoToolStripMenuItem";
@@ -259,13 +283,6 @@ namespace OnDoc.UICintrols
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Text = "Zellenwert in Zwischenablage kopieren";
this.zellenwertInZwischenablageKopierenToolStripMenuItem.Click += new System.EventHandler(this.zellenwertInZwischenablageKopierenToolStripMenuItem_Click);
//
// druckenToolStripMenuItem
//
this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.druckenToolStripMenuItem.Text = "Drucken";
this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
//
// pDFGenerierenToolStripMenuItem
//
this.pDFGenerierenToolStripMenuItem.Name = "pDFGenerierenToolStripMenuItem";
@@ -304,13 +321,6 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -428,6 +438,7 @@ namespace OnDoc.UICintrols
this.lblTitel.TabIndex = 2;
this.lblTitel.Text = "Pendente Dokumente";
this.lblTitel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTitel.Visible = false;
//
// ribbonPanel2
//
@@ -1053,6 +1064,7 @@ namespace OnDoc.UICintrols
//
// RibbonPanelDiverses
//
this.RibbonPanelDiverses.ButtonMoreVisible = false;
this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK);
this.RibbonPanelDiverses.Name = "RibbonPanelDiverses";
this.RibbonPanelDiverses.Text = "Diverse Funktionen";
@@ -1368,5 +1380,6 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanelZuweisung;
private System.Windows.Forms.ToolStripMenuItem historyToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dokumentKopierenToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
}
}

57
Client/UIControls/DokList.cs
View File

@@ -662,7 +662,9 @@ namespace OnDoc.UICintrols
if (dokumenttypnr == 0)
{
DokTypSelect DokTypSelect = new DokTypSelect(Favoriten);
//;
DokTypSelect.vorlagentype = 1;
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
@@ -685,6 +687,8 @@ namespace OnDoc.UICintrols
else
{
frmnewdok.ShowDialog();
refresh_dokumente();
}
switch (frmnewdok.DocFunction)
{
@@ -713,6 +717,17 @@ namespace OnDoc.UICintrols
break;
case 5:
break;
case 6:
selected_dokumentid = frmnewdok.dokumentid;
selected_partnernr = frmnewdok.partnernr.ToString(); ;
interop = frmnewdok.interop;
runmacros = frmnewdok.runmacros;
string filename = frmnewdok.filename;
DB db = new DB(AppParams.connectionstring);
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
break;
default:
break;
}
@@ -1200,6 +1215,7 @@ namespace OnDoc.UICintrols
else
{
this.lblToApprove.Text = db.dsdaten.Tables[0].Rows[0][0].ToString();
lblToApprove.Visible = true;
}
db = null;
}
@@ -1635,6 +1651,10 @@ namespace OnDoc.UICintrols
RibbonButtonArchivToOnBase.Enabled = false;
dokumentBearbeitenToolStripMenuItem.Enabled = false;
dokumentLöschenToolStripMenuItem.Enabled = false;
druckenToolStripMenuItem.Enabled = false;
dokumentKopierenToolStripMenuItem.Enabled = false;
attributeAnzeigenVersteckenToolStripMenuItem.Enabled = false;
historyToolStripMenuItem.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = false;
selected_dokumentid = "";
@@ -1652,6 +1672,10 @@ namespace OnDoc.UICintrols
dokumentLöschenToolStripMenuItem.Enabled = true;
archivierenToolStripMenuItem.Enabled = true;
zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = true;
druckenToolStripMenuItem.Enabled = true;
dokumentKopierenToolStripMenuItem.Enabled = true;
attributeAnzeigenVersteckenToolStripMenuItem.Enabled = true;
historyToolStripMenuItem.Enabled = true;
this.sfDataGrid1.SelectedItem = this.sfDataGrid1.View.Records[0];
sfDataGrid1.SelectedIndex = 0;
@@ -1771,16 +1795,41 @@ namespace OnDoc.UICintrols
private void historyToolStripMenuItem_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
DokHistory dh = new DokHistory(selected_dokumentid);
dh.ShowDialog();
}
private void dokumentKopierenToolStripMenuItem_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.copydoc(selected_dokumentid);
db = null;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
if (MessageBox.Show("Gewähltes Dokument kopieren?", "Dokument kopieren", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
DB db = new DB(AppParams.connectionstring);
string newdocid = db.copydoc(selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
if (newdocid == "")
{
MessageBox.Show("Das Dokument ID:'" + selected_dokumentid + "' konnte nicht kopiert werden.", "Dokument kopieren", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
MessageBox.Show("Das Dokument wurde erfolgreich kopiert. Neue Dokument.ID:'" + newdocid + "'.", "Dokument kopieren", MessageBoxButtons.OK, MessageBoxIcon.Information);
Logging.DocLog.Info("Dokumentkopie von '" + selected_dokumentid + "' erstellt", "OnDoc.DocList'", newdocid, "", "Dokumentkopie erstellt");
refresh_dokumente();
}
}
}
private void sfDataGrid1_CellDoubleClick(object sender, CellClickEventArgs e)
{
sfDataGrid1_CellClick(sender, e);
dokumentBearbeitenToolStripMenuItem_Click(sender, e);
}
}

50
Client/UIControls/DokTypDetail.cs
View File

@@ -45,37 +45,51 @@ namespace OnDoc.UIControls
DataRow dr = details.NewRow();
dr[0] = dc.ColumnName.ToString().Replace("_", "");
dr[1] = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
if (dc.ColumnName.ToString().Replace("_", "") == "Vertrag")
try
{
if (dB.dsdaten.Tables[0].Columns[0].DataType == typeof(Boolean)) {
if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName]) == false)
{
dr[1] = "Nein";
}
else
{ dr[1] = "Ja"; }
}
else
{
}
}
details.Rows.Add(dr);
catch { }
details.Rows.Add(dr);
}
else
{
DocGet dg = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "");
string PDF = "";
switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper())
if (dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString() != "")
{
case "WORD":
PDF = dg.Convert_Word_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "EXCEL":
PDF = dg.Convert_Excel_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "PDF":
PDF = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
break;
default:
break;
DocGet dg = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "");
string PDF = "";
switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper())
{
case "WORD":
PDF = dg.Convert_Word_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "EXCEL":
PDF = dg.Convert_Excel_To_PDF(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString());
break;
case "PDF":
PDF = dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString();
break;
default:
break;
}
docPreview1.show_base64(PDF, "Dokumenttyp: " + dokumenttypnr.ToString());
dg = null;
dok = null;
}
docPreview1.show_base64(PDF);
}
}
sfDataGrid1.DataSource = details;

33
Client/UIControls/Partnersuche.cs
View File

@@ -32,6 +32,8 @@ namespace OnDoc.UIControls
public bool personendokument { get; set; } = false;
public bool check_bp_person { get; set; } = false;
public int dokumenttypnr { get; set; } = 0;
public Partnersuche()
{
InitializeComponent();
@@ -47,6 +49,18 @@ namespace OnDoc.UIControls
clsPartner.set_connectionstring(AppParams.connectionstring);
this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick;
}
public Partnersuche(bool personendokument, bool check_bp_person, int dokumenttypnr=0)
{
InitializeComponent();
this.personendokument = personendokument;
this.check_bp_person = check_bp_person;
clsPartner.set_connectionstring(AppParams.connectionstring);
this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick;
this.dokumenttypnr = dokumenttypnr;
}
private void Form1_Load(object sender, EventArgs e)
{
this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y);
@@ -223,6 +237,23 @@ namespace OnDoc.UIControls
catch { return false; }
finally { db=null; }
}
if (partnersaldiert)
{
DB db = new DB(AppParams.connectionstring);
try
{
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr.ToString(),false,true);
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["vertrag"]) == true)
{
MessageBox.Show("Das Dokument " + db.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString() + " kann nicht für einen saldierten Partner erstellt werden.","Dokument erstellen", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
catch { return false; }
finally { db = null; }
}
return true;
@@ -257,7 +288,7 @@ namespace OnDoc.UIControls
{
try
{
get_details();
if (!get_details()) { return; };
//partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00"));
//partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00");
//partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert"));

13
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -504,7 +504,7 @@ namespace OnDoc.UIControls
private void show_partnerdialog()
{
Partnersuche ps = new Partnersuche(personendokument,true);
Partnersuche ps = new Partnersuche(personendokument,true,dokumenttypnr);
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
@@ -539,10 +539,11 @@ namespace OnDoc.UIControls
switch (feldtyp.ToUpper())
{
case "DATUMSHORT":
case "DATUMMEDIUM":
case "DATUMLONG":
break;
frmCalendar f = new frmCalendar();
valueselector f = new valueselector(true);
f.ShowDialog();
string res = "";
if (f.DialogResult == DialogResult.OK)
@@ -550,15 +551,15 @@ namespace OnDoc.UIControls
if (feldtyp.ToUpper() == "DATUMSHORT")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datumshort);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datumshort);
}
if (feldtyp.ToUpper() == "DATUMMEDIUM")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datummedium);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
if (feldtyp.ToUpper() == "DATUMLONG")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.sfCalendar1.SelectedDate), Helper.ConvertHelper.DateTimeFormat.datummedium);
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
}
f.Dispose();