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

Update 20250331

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-31 21:01:07 +02:00
parent c0bf4774b5
commit 632b97c292
23 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
View File

Binary file not shown.

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(150, 26);
this.label2.TabIndex = 2;
this.label2.Text = "28. März 2025";
this.label2.Text = "31. März 2025";
//
// SplashScreen
//

8
Client/DocMgmt/SerienbriefTemplateLoad.cs
View File

@@ -11,6 +11,7 @@ using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Controls;
using Database;
using System.Security.RightsManagement;
namespace OnDoc.DocMgmt
{
@@ -19,6 +20,7 @@ namespace OnDoc.DocMgmt
private string mitarbeiternr { get; set; } = "";
public string selectedID = "";
public string file = "";
public string usedfelder = "";
public SerienbriefTemplateLoad()
{
InitializeComponent();
@@ -44,9 +46,10 @@ namespace OnDoc.DocMgmt
}
private void load_data() {
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select ID,Bezeichnung from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true);
db.Get_Tabledata("Select ID,Bezeichnung, isnull(usedfelder,'') as UsedFelder from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true);
this.sfDataGrid1.DataSource = db.dsdaten.Tables[0];
this.sfDataGrid1.Columns[0].Visible = false;
this.sfDataGrid1.Columns[2].Visible = false;
db = null;
}
@@ -80,8 +83,9 @@ namespace OnDoc.DocMgmt
{
DialogResult = DialogResult.OK;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select vorlage from ondoc_sb_vorlage where id=" + selectedID, false, true);
db.Get_Tabledata("Select vorlage, usedfelder from ondoc_sb_vorlage where id=" + selectedID, false, true);
this.file = db.dsdaten.Tables[0].Rows[0][0].ToString();
this.usedfelder = db.dsdaten.Tables[0].Rows[0][1].ToString();
db = null;
this.Close();
}

37
Client/UIControls/Serienbrief.cs
View File

@@ -45,6 +45,8 @@ using OnDoc.Diverses;
using Syncfusion.Windows.Shared;
using System.Web.UI.WebControls;
using Syncfusion.Windows.Forms.CellGrid.ScrollAxis;
using Newtonsoft.Json;
using Syncfusion.XlsIO;
namespace OnDoc.UIControls
@@ -325,6 +327,19 @@ namespace OnDoc.UIControls
//this.Close();
}
private void Import_sf_Excel(string filename, string sheetname, ref System.Data.DataTable importdata)
{
ExcelEngine excelEngine = new ExcelEngine();
IApplication application = excelEngine.Excel;
IWorkbook workbook = application.Workbooks.Open(filename);
IWorksheet sheet = workbook.Worksheets[0];
importdata = sheet.ExportDataTable(sheet.UsedRange, ExcelExportDataTableOptions.ColumnNames);
sheet = null;
workbook.Close();
workbook = null;
excelEngine = null;
}
private void RibbonButtonExcelImport_Click(object sender, EventArgs e)
{
@@ -357,7 +372,9 @@ namespace OnDoc.UIControls
}
else { selected_sheetname = sheets[0]; }
reader.Excel_To_Datatabable(openFileDialog1.FileName, selected_sheetname, true, ref importdata);
Import_sf_Excel(openFileDialog1.FileName, selected_sheetname, ref importdata);
//reader.Excel_To_Datatabable(openFileDialog1.FileName, selected_sheetname, true, ref importdata);
init_progressbar("Daten importieren", importdata.Rows.Count);
if (importdata.Rows.Count > 2500)
{
@@ -2464,6 +2481,7 @@ namespace OnDoc.UIControls
//if (input.Result == InputBoxResult.OK) {
// string bez = input.Items["Bezeichnung"].ToString();
update_serienbriefdaten(false);
string json = JsonConvert.SerializeObject(sb.dsempfaenger.Tables["UsedFelder"], Formatting.Indented);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dbo.binarytobase64(vorlage),DocType from edex_sb_vorlage where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true);
string file = db.dsdaten.Tables[0].Rows[0][0].ToString();
@@ -2478,9 +2496,13 @@ namespace OnDoc.UIControls
dr[6] = true;
dr[7] = dokytype;
dr[8] = bez;
dr[9] = json;
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db = null;
}
}
@@ -2489,13 +2511,22 @@ namespace OnDoc.UIControls
{
SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString());
sbt.ShowDialog();
if (
sbt.DialogResult == DialogResult.OK) {
if (sbt.DialogResult == DialogResult.OK)
{
sb.VorlageBase64 = sbt.file;
FileHelper fh = new FileHelper();
fh.SaveBase64ToFile(sbt.file, sb.filename);
fh = null;
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
string json = sbt.usedfelder;
System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable)));
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
foreach (System.Data.DataRow dr in dt.Rows)
{
sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr);
};
update_serienbriefdaten(false);
}

70
Client/Versandstrasse/Versandstrasse.Designer.cs generated
View File

@@ -28,12 +28,13 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse));
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnDruckPaketNew = new System.Windows.Forms.ToolStripButton();
@@ -41,6 +42,7 @@
this.tscheckboxpreview = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox();
this.GrpPaketDetails = new System.Windows.Forms.GroupBox();
this.panelVerify = new System.Windows.Forms.Panel();
this.button2 = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.btnSendFinal = new System.Windows.Forms.Button();
@@ -62,7 +64,8 @@
this.panel3 = new System.Windows.Forms.Panel();
this.panelPrepare = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.toolStrip1.SuspendLayout();
this.GrpPaketDetails.SuspendLayout();
@@ -74,6 +77,7 @@
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
this.panelPrepare.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// treeViewAdv1
@@ -94,6 +98,7 @@
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(548, 493);
this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeViewAdv1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.treeViewAdv1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
@@ -215,6 +220,16 @@
this.panelVerify.TabIndex = 6;
this.panelVerify.Visible = false;
//
// button2
//
this.button2.Location = new System.Drawing.Point(3, 68);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(123, 23);
this.button2.TabIndex = 7;
this.button2.Text = "Abbrechen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// label3
//
this.label3.AutoSize = true;
@@ -427,17 +442,17 @@
this.pdfViewerControl1.IsTextSearchEnabled = true;
this.pdfViewerControl1.IsTextSelectionEnabled = true;
this.pdfViewerControl1.Location = new System.Drawing.Point(0, 0);
messageBoxSettings4.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings4;
messageBoxSettings1.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1;
this.pdfViewerControl1.MinimumZoomPercentage = 50;
this.pdfViewerControl1.Name = "pdfViewerControl1";
this.pdfViewerControl1.PageBorderThickness = 1;
pdfViewerPrinterSettings4.Copies = 1;
pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation")));
pdfViewerPrinterSettings4.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings4;
pdfViewerPrinterSettings1.Copies = 1;
pdfViewerPrinterSettings1.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings1.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings1.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings1.PrintLocation")));
pdfViewerPrinterSettings1.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings1;
this.pdfViewerControl1.ReferencePath = null;
this.pdfViewerControl1.ScrollDisplacementValue = 0;
this.pdfViewerControl1.ShowHorizontalScrollBar = true;
@@ -447,10 +462,10 @@
this.pdfViewerControl1.SpaceBetweenPages = 8;
this.pdfViewerControl1.TabIndex = 10;
this.pdfViewerControl1.Text = "pdfViewerControl1";
textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings4.HighlightAllInstance = true;
textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings4;
textSearchSettings1.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings1.HighlightAllInstance = true;
textSearchSettings1.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings1;
this.pdfViewerControl1.ThemeName = "Default";
this.pdfViewerControl1.VerticalScrollOffset = 0;
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -503,15 +518,19 @@
this.label4.TabIndex = 0;
this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten....";
//
// button2
// contextMenuStrip1
//
this.button2.Location = new System.Drawing.Point(3, 68);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(123, 23);
this.button2.TabIndex = 7;
this.button2.Text = "Abbrechen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.löschenToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48);
this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click);
//
// löschenToolStripMenuItem
//
this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem";
this.löschenToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.löschenToolStripMenuItem.Text = "Löschen";
//
// Versandstrasse
//
@@ -546,6 +565,7 @@
this.panel3.ResumeLayout(false);
this.panelPrepare.ResumeLayout(false);
this.panelPrepare.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -580,5 +600,7 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem;
}
}

42
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -318,20 +318,47 @@ namespace OnDoc.Versandstrasse
try
{
Versandpaket paket = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
foreach (Versanddokument vsdok in paket.Dokument)
foreach (TreeNodeAdv tn in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vsdok in paket.Dokument)
{
if (vsdok.DokumentID == tn.Tag.ToString())
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey, Application.StartupPath);
//string dok = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring);
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
}
}
}
//foreach (Versanddokument vsdok in paket.Dokument)
//{
// clsVersandstrasse vs = new clsVersandstrasse();
// vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey, Application.StartupPath);
// //string dok = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring);
//}
Stream[] streams = new Stream[paket.Dokument.Count];
int i = 0;
foreach (TreeNodeAdv tn in treeViewAdv1.SelectedNode.Nodes)
{
foreach (Versanddokument vsdok in paket.Dokument)
{
if (vsdok.DokumentID == tn.Tag.ToString())
{
var stream = new MemoryStream(Convert.FromBase64String(vsdok.dokument));
streams[i] = stream;
i++;
}
}
}
//foreach (Versanddokument vsdok in paket.Dokument)
//{
// var stream = new MemoryStream(Convert.FromBase64String(vsdok.dokument));
// streams[i] = stream;
// i++;
//}
string stapel = save_stapel(ref streams);
@@ -621,5 +648,14 @@ namespace OnDoc.Versandstrasse
{
panelVerify.Visible = false;
}
private void contextMenuStrip1_Click(object sender, EventArgs e)
{
try
{
treeViewAdv1.SelectedNode.Remove();
}
catch { }
}
}
}

5
Client/Versandstrasse/Versandstrasse.resx
View File

@@ -117,10 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings1.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
View File

Binary file not shown.