update 20260326

This commit is contained in:
Stefan Hutter
2026-03-26 18:26:34 +01:00
parent 399d63bc69
commit e82057b6e4
87 changed files with 5024 additions and 139 deletions

View File

@@ -289,6 +289,13 @@
<Compile Include="Helper\Helper.cs" /> <Compile Include="Helper\Helper.cs" />
<Compile Include="Helper\ImageHelper.cs" /> <Compile Include="Helper\ImageHelper.cs" />
<Compile Include="Models\StaticParams.cs" /> <Compile Include="Models\StaticParams.cs" />
<Compile Include="PDFViewer.aspx.cs">
<DependentUpon>PDFViewer.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PDFViewer.aspx.designer.cs">
<DependentUpon>PDFViewer.aspx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CLM.aspx.cs"> <Compile Include="CLM.aspx.cs">
<DependentUpon>CLM.aspx</DependentUpon> <DependentUpon>CLM.aspx</DependentUpon>
@@ -329,6 +336,7 @@
<Content Include="dt.aspx" /> <Content Include="dt.aspx" />
<Content Include="favicon.ico" /> <Content Include="favicon.ico" />
<Content Include="Global.asax" /> <Content Include="Global.asax" />
<Content Include="PDFViewer.aspx" />
<Content Include="Scripts\bootstrap.bundle.js" /> <Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" /> <Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.esm.js" /> <Content Include="Scripts\bootstrap.esm.js" />

View File

@@ -20,9 +20,9 @@
"idField": "ID", "idField": "ID",
"displayField": "ID", "displayField": "ID",
"jsonField": "JsonData", "jsonField": "JsonData",
"Buttons": "Öffnen", "Buttons": "Öffnen;DokumenteAnzeigen",
"AnzeigeDokument": "", "AnzeigeDokument": "",
"FilterColumns": "GUID" "FilterColumns": "id;GUID"
}, },
{ {

View File

@@ -1,7 +1,7 @@
[ [
{ {
"UserID": "admin", "UserID": "admin",
"Password": "1234" "Password": "12345"
}, },
{ {
"UserID": "user1", "UserID": "user1",

View File

@@ -304,15 +304,30 @@ padding-bottom:20px;
} }
); );
}
function showAPIDocs(tableKey, id) {
PageMethods.gwrAPIDocs(
tableKey,
id,
function (result) {
var pdfWindow = window.open("");
pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>");
},
function (err) {
alert(err.get_message())
}
);
} }
function showPacDoc(tableKey, id) { function showPacDoc(tableKey, id) {
PageMethods.GetPacDoc( PageMethods.GetPacDoc(
tableKey, tableKey,
id, id,
function (result) { function (result) {
window.open("\PDFViewer.aspx", '_blank').focus();
var pdfWindow = window.open(""); //var pdfWindow = window.open("");
pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>"); //pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>");
}, },
function (err) { function (err) {

View File

@@ -1,4 +1,5 @@
using Model; using Database;
using Model;
using Newtonsoft.Json; using Newtonsoft.Json;
using SecuringWebApiUsingApiKey.Middleware; using SecuringWebApiUsingApiKey.Middleware;
using System; using System;
@@ -6,6 +7,7 @@ using System.Buffers.Text;
using System.Configuration; using System.Configuration;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Web; using System.Web;
@@ -162,6 +164,18 @@ namespace WebApp
c3.Controls.Add(l3); c3.Controls.Add(l3);
e.Row.Cells.Add(c3); e.Row.Cells.Add(c3);
break;
case "DOKUMENTEANZEIGEN":
var c4 = new TableCell();
var l4 = new LinkButton
{
Text = "Dokumente(e) anzeigen",
CssClass = "open"
};
l4.OnClientClick = $"showAPIDocs('{tableKeyJs}','{idJs}'); return false;";
c4.Controls.Add(l4);
e.Row.Cells.Add(c4);
break; break;
} }
@@ -196,6 +210,67 @@ namespace WebApp
//e.Row.Cells.Add(cell); //e.Row.Cells.Add(cell);
} }
private static Random random = new Random();
public static string RandomString(int length)
{
const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
return new string(Enumerable.Repeat(chars, length)
.Select(s => s[random.Next(s.Length)]).ToArray());
}
[WebMethod]
public static object gwrAPIDocs(string table, string id)
{
var config = TableConfigProvider.LoadConfig();
var cfg = config.Tables.FirstOrDefault(t => t.Key == table);
if (cfg == null) return "Tabelle nicht gefunden";
string sql = "SELECT NLOGApiDoc_1.id, NLOGApiDoc_1.GUID, a.Div FROM edoka_journale.dbo.NLOGApiDoc as a INNER JOIN edoka_journale.dbo.NLOGApiDoc AS NLOGApiDoc_1 ON a.GUID = NLOGApiDoc_1.GUID";
sql = sql + " WHERE (a.Div LIKE 'offedk%') AND (NLOGApiDoc_1.id = " + id + ")";
int rowcount = 0;
System.IO.DirectoryInfo di = new DirectoryInfo(@"d:\apps\ondoc\admintemp\");
foreach (FileInfo file in di.GetFiles())
{
file.Delete();
}
string prefix=RandomString(6).ToString();
using (var con = new SqlConnection(StringCipher.Decrypt(ConfigurationManager.ConnectionStrings["DocTesterconnectionstring"].ConnectionString, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm")))
using (var cmd = new SqlCommand(sql, con))
{
//cmd.Parameters.AddWithValue("@id", id);
con.Open();
var dt = new DataTable();
dt.Load(cmd.ExecuteReader());
con.Close();
rowcount = dt.Rows.Count;
if (rowcount > 0)
{
foreach (DataRow dr in dt.Rows)
{
cmd.CommandText = "Select dbo.BinaryToBase64(dokument) from dbo.doks where dokumentid='" + dr[2].ToString() + "'";
con.Open();
string doc = cmd.ExecuteScalar()?.ToString();
con.Close();
var ms1 = new MemoryStream(Convert.FromBase64String(doc));
using (System.IO.FileStream file = new System.IO.FileStream(@"d:\apps\ondoc\admintemp\" + prefix + dr[2].ToString() + ".pdf", System.IO.FileMode.Create, System.IO.FileAccess.Write))
{
byte[] bytes = new byte[ms1.Length];
ms1.Read(bytes, 0, (int)ms1.Length);
file.Write(bytes, 0, bytes.Length);
ms1.Close();
}
ms1 = null;
}
return prefix;
}
else
{
return "";
}
}
}
[WebMethod] [WebMethod]
public static object GetPacDoc(string table, string id) public static object GetPacDoc(string table, string id)
{ {
@@ -205,26 +280,36 @@ namespace WebApp
using (var con = new SqlConnection(StringCipher.Decrypt(ConfigurationManager.ConnectionStrings["DocTesterconnectionstring"].ConnectionString, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm"))) using (var con = new SqlConnection(StringCipher.Decrypt(ConfigurationManager.ConnectionStrings["DocTesterconnectionstring"].ConnectionString, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm")))
using (var cmd = new SqlCommand(cfg.AnzeigeDokument, con)) using (var cmd = new SqlCommand(cfg.AnzeigeDokument, con))
{ {
System.IO.DirectoryInfo di = new DirectoryInfo(@"d:\apps\ondoc\admintemp\");
foreach (FileInfo file in di.GetFiles())
{
file.Delete();
}
cmd.Parameters.AddWithValue("@id", id); cmd.Parameters.AddWithValue("@id", id);
con.Open(); con.Open();
string doc = cmd.ExecuteScalar()?.ToString(); var dt = new DataTable();
dt.Load(cmd.ExecuteReader());
con.Close(); con.Close();
dynamic dataj = JsonConvert.DeserializeObject(doc);
var b64 = dataj.finaldoc.ToString(); ; Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dt.Rows[0][0].ToString());
bool isbase64 = (b64.Length % 4 == 0) && Regex.IsMatch(b64, @"^[a-zA-Z0-9\+/]*={0,3}$", RegexOptions.None); var b64 = vp.finaldoc;
b64 = System.IO.File.ReadAllText(@"y:\clm.json"); var ms = new MemoryStream(Convert.FromBase64String(b64));
return b64; ; using (System.IO.FileStream file = new System.IO.FileStream(@"d:\apps\ondoc\admintemp\vp.pdf", System.IO.FileMode.Create, System.IO.FileAccess.Write))
{
byte[] bytes = new byte[ms.Length];
ms.Read(bytes, 0, (int)ms.Length);
file.Write(bytes, 0, bytes.Length);
ms.Close();
}
//System.Diagnostics.Process.Start(@"d:\apps\ondoc\admintemp\vp.pdf");
//System.IO.File.Delete("d:\\ondoc\\temp\\vp.pdf");
return "";
} }
} }
public static bool IsBase64String(string base64)
{
base64 = base64.Trim();
return (base64.Length % 4 == 0) && Regex.IsMatch(base64, @"^[a-zA-Z0-9\+/]*={0,3}$", RegexOptions.None);
}
[WebMethod] [WebMethod]
public static object GetDoc(string table, string id) public static object GetDoc(string table, string id)
{ {
@@ -238,7 +323,7 @@ namespace WebApp
con.Open(); con.Open();
string doc = cmd.ExecuteScalar()?.ToString(); string doc = cmd.ExecuteScalar()?.ToString();
con.Close(); con.Close();
System.IO.File.WriteAllText(@"y:\clm.json", doc);
return doc; return doc;
} }
} }

View File

@@ -0,0 +1,14 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PDFViewer.aspx.cs" Inherits="OnDocAPI_NetFramework.PDFViewer" %>
<!DOCTYPE html>
<html>
<head runat="server">
<title>PDF Viewer</title>
</head>
<body>
<form id="form1" runat="server">
<!-- Optional: Falls du die PDF im selben Layout anzeigen willst -->
<iframe src="PdfViewer.aspx?inline=true" width="100%" height="800px"></iframe>
</form>
</body>
</html>

View File

@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace OnDocAPI_NetFramework
{
public partial class PDFViewer : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
string filePath = @"D:\apps\ondoc\admintemp\vp.pdf";
if (!System.IO.File.Exists(filePath))
{
Response.Write("PDF nicht gefunden.");
Response.End();
return;
}
Response.Clear();
Response.ContentType = "application/pdf";
Response.AddHeader("Content-Disposition", "inline; filename=sample.pdf");
Response.TransmitFile(filePath);
Response.End();
}
}
}

View File

@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <automatisch generiert>
// Dieser Code wurde von einem Tool generiert.
//
// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn
// der Code neu generiert wird.
// </automatisch generiert>
//------------------------------------------------------------------------------
namespace OnDocAPI_NetFramework
{
public partial class PDFViewer
{
/// <summary>
/// form1-Steuerelement.
/// </summary>
/// <remarks>
/// Automatisch generiertes Feld.
/// Zum Ändern Felddeklaration aus der Designerdatei in eine Code-Behind-Datei verschieben.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}

View File

@@ -5,15 +5,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc</_PublishTargetUrl> <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc</_PublishTargetUrl>
<History>True|2026-03-22T12:25:52.6279375Z||;True|2026-03-20T07:24:37.8861696+01:00||;True|2026-03-19T21:38:10.9526034+01:00||;True|2026-03-18T17:41:36.3493613+01:00||;True|2026-03-18T14:58:36.6641588+01:00||;True|2026-03-18T13:36:39.6754082+01:00||;True|2026-03-18T13:28:13.3767791+01:00||;True|2026-03-18T12:39:58.8696214+01:00||;True|2026-03-18T10:12:19.4421254+01:00||;True|2026-03-18T09:23:32.7324650+01:00||;True|2026-03-18T08:30:31.0127326+01:00||;True|2026-03-17T16:29:03.7106180+01:00||;True|2026-03-17T16:11:10.6005495+01:00||;True|2026-03-17T15:59:13.2348406+01:00||;True|2026-03-17T15:31:12.0317447+01:00||;True|2026-03-17T14:48:40.3877203+01:00||;True|2026-03-17T14:11:25.3562261+01:00||;True|2026-03-17T13:47:11.1326741+01:00||;True|2026-03-16T15:31:10.2555705+01:00||;True|2026-03-16T14:12:19.6773991+01:00||;True|2026-03-16T13:55:53.2937690+01:00||;True|2026-03-16T13:49:40.9223505+01:00||;True|2026-03-16T13:45:46.5476155+01:00||;True|2026-03-16T10:05:17.8849739+01:00||;True|2026-03-16T09:50:03.0002779+01:00||;True|2026-03-15T17:59:21.9961152+01:00||;True|2026-03-15T17:55:23.9254472+01:00||;False|2026-03-15T17:55:17.4934783+01:00||;True|2026-03-15T17:30:56.4581787+01:00||;True|2026-03-15T17:27:23.6999475+01:00||;True|2026-03-15T17:06:43.4082140+01:00||;True|2026-03-15T16:47:00.3514115+01:00||;True|2026-03-15T15:08:09.6821523+01:00||;True|2026-03-12T16:06:53.7395894+01:00||;True|2026-03-11T18:52:45.1428118+01:00||;True|2026-03-11T18:28:35.8258686+01:00||;True|2026-03-11T18:28:14.0116992+01:00||;True|2026-03-11T18:19:41.2917598+01:00||;True|2026-03-11T18:16:14.3982080+01:00||;True|2026-03-11T17:58:30.8611742+01:00||;True|2026-03-09T15:02:39.2942135+01:00||;True|2026-03-09T13:40:46.3543575+01:00||;True|2026-03-09T10:31:33.7382200+01:00||;True|2026-03-08T08:13:35.2118387+01:00||;True|2026-03-07T21:30:15.7021682+01:00||;True|2026-03-07T16:04:27.6676302+01:00||;True|2026-03-03T07:42:58.6695248+01:00||;True|2026-03-02T18:56:44.9083635+01:00||;True|2026-03-02T15:22:04.7632771+01:00||;True|2026-03-02T15:17:19.5888051+01:00||;True|2026-03-02T14:44:15.1850254+01:00||;False|2026-03-02T14:43:43.8750165+01:00||;True|2026-03-02T13:00:06.4813259+01:00||;True|2026-03-02T09:00:14.6639978+01:00||;True|2026-02-26T14:00:46.9137562+01:00||;True|2026-02-26T10:52:44.7996454+01:00||;True|2026-02-26T10:20:38.9297393+01:00||;True|2026-02-26T08:17:22.1709972+01:00||;True|2026-02-26T08:01:54.5490566+01:00||;True|2026-02-26T07:56:47.9173498+01:00||;True|2026-02-26T05:50:34.4180646+01:00||;True|2026-02-25T16:00:31.8051644+01:00||;True|2026-02-25T15:40:22.6200444+01:00||;True|2026-02-25T15:32:39.6209326+01:00||;True|2026-02-25T15:03:49.5202958+01:00||;True|2026-02-25T14:49:40.4560899+01:00||;True|2026-02-25T10:41:35.9042956+01:00||;True|2026-02-25T10:33:42.2485129+01:00||;True|2026-02-25T10:05:23.9864404+01:00||;True|2026-02-24T20:45:52.7533529+01:00||;True|2026-02-24T17:49:48.6739610+01:00||;True|2026-02-24T14:30:47.0663499+01:00||;True|2026-02-24T09:28:30.5328425+01:00||;True|2026-02-24T08:40:15.6054714+01:00||;True|2026-02-24T07:59:34.6469067+01:00||;True|2026-02-24T07:30:03.4506392+01:00||;True|2026-02-23T08:26:05.4681353+01:00||;True|2026-02-22T10:44:29.6270572+01:00||;True|2026-02-22T10:41:26.3016875+01:00||;True|2026-02-22T10:30:20.0395713+01:00||;True|2026-02-22T10:06:09.3728289+01:00||;True|2026-02-20T11:11:41.2906293+01:00||;True|2026-02-20T10:46:35.4015642+01:00||;True|2026-02-20T09:45:14.8833885+01:00||;True|2026-02-20T07:32:39.1940489+01:00||;True|2026-02-18T09:12:43.1434580+01:00||;True|2026-02-17T15:15:14.8805757+01:00||;True|2026-02-17T11:09:40.4786451+01:00||;True|2026-02-17T10:45:37.3358353+01:00||;True|2026-02-17T10:33:30.6184470+01:00||;True|2026-02-16T18:55:30.1424518+01:00||;True|2026-02-16T18:01:46.0478978+01:00||;True|2026-02-16T14:51:53.3273467+01:00||;True|2026-02-16T14:12:09.6130777+01:00||;True|2026-02-16T11:21:18.5769808+01:00||;True|2026-02-16T10:08:08.4277947+01:00||;True|2026-02-16T09:52:01.8749049+01:00||;True|2026-02-16T08:13:22.5356518+01:00||;True|2026-02-13T12:36:18.0536988+01:00||;True|2026-02-13T07:29:34.9460520+01:00||;</History> <History>True|2026-03-26T14:26:02.2751561Z||;True|2026-03-25T21:25:11.0646560+01:00||;True|2026-03-25T17:13:28.1157629+01:00||;True|2026-03-25T17:05:35.8912458+01:00||;True|2026-03-25T17:00:55.0064754+01:00||;True|2026-03-24T14:39:42.8828134+01:00||;True|2026-03-23T15:07:18.4892650+01:00||;True|2026-03-23T10:20:19.1623589+01:00||;True|2026-03-22T13:25:52.6279375+01:00||;True|2026-03-20T07:24:37.8861696+01:00||;True|2026-03-19T21:38:10.9526034+01:00||;True|2026-03-18T17:41:36.3493613+01:00||;True|2026-03-18T14:58:36.6641588+01:00||;True|2026-03-18T13:36:39.6754082+01:00||;True|2026-03-18T13:28:13.3767791+01:00||;True|2026-03-18T12:39:58.8696214+01:00||;True|2026-03-18T10:12:19.4421254+01:00||;True|2026-03-18T09:23:32.7324650+01:00||;True|2026-03-18T08:30:31.0127326+01:00||;True|2026-03-17T16:29:03.7106180+01:00||;True|2026-03-17T16:11:10.6005495+01:00||;True|2026-03-17T15:59:13.2348406+01:00||;True|2026-03-17T15:31:12.0317447+01:00||;True|2026-03-17T14:48:40.3877203+01:00||;True|2026-03-17T14:11:25.3562261+01:00||;True|2026-03-17T13:47:11.1326741+01:00||;True|2026-03-16T15:31:10.2555705+01:00||;True|2026-03-16T14:12:19.6773991+01:00||;True|2026-03-16T13:55:53.2937690+01:00||;True|2026-03-16T13:49:40.9223505+01:00||;True|2026-03-16T13:45:46.5476155+01:00||;True|2026-03-16T10:05:17.8849739+01:00||;True|2026-03-16T09:50:03.0002779+01:00||;True|2026-03-15T17:59:21.9961152+01:00||;True|2026-03-15T17:55:23.9254472+01:00||;False|2026-03-15T17:55:17.4934783+01:00||;True|2026-03-15T17:30:56.4581787+01:00||;True|2026-03-15T17:27:23.6999475+01:00||;True|2026-03-15T17:06:43.4082140+01:00||;True|2026-03-15T16:47:00.3514115+01:00||;True|2026-03-15T15:08:09.6821523+01:00||;True|2026-03-12T16:06:53.7395894+01:00||;True|2026-03-11T18:52:45.1428118+01:00||;True|2026-03-11T18:28:35.8258686+01:00||;True|2026-03-11T18:28:14.0116992+01:00||;True|2026-03-11T18:19:41.2917598+01:00||;True|2026-03-11T18:16:14.3982080+01:00||;True|2026-03-11T17:58:30.8611742+01:00||;True|2026-03-09T15:02:39.2942135+01:00||;True|2026-03-09T13:40:46.3543575+01:00||;True|2026-03-09T10:31:33.7382200+01:00||;True|2026-03-08T08:13:35.2118387+01:00||;True|2026-03-07T21:30:15.7021682+01:00||;True|2026-03-07T16:04:27.6676302+01:00||;True|2026-03-03T07:42:58.6695248+01:00||;True|2026-03-02T18:56:44.9083635+01:00||;True|2026-03-02T15:22:04.7632771+01:00||;True|2026-03-02T15:17:19.5888051+01:00||;True|2026-03-02T14:44:15.1850254+01:00||;False|2026-03-02T14:43:43.8750165+01:00||;True|2026-03-02T13:00:06.4813259+01:00||;True|2026-03-02T09:00:14.6639978+01:00||;True|2026-02-26T14:00:46.9137562+01:00||;True|2026-02-26T10:52:44.7996454+01:00||;True|2026-02-26T10:20:38.9297393+01:00||;True|2026-02-26T08:17:22.1709972+01:00||;True|2026-02-26T08:01:54.5490566+01:00||;True|2026-02-26T07:56:47.9173498+01:00||;True|2026-02-26T05:50:34.4180646+01:00||;True|2026-02-25T16:00:31.8051644+01:00||;True|2026-02-25T15:40:22.6200444+01:00||;True|2026-02-25T15:32:39.6209326+01:00||;True|2026-02-25T15:03:49.5202958+01:00||;True|2026-02-25T14:49:40.4560899+01:00||;True|2026-02-25T10:41:35.9042956+01:00||;True|2026-02-25T10:33:42.2485129+01:00||;True|2026-02-25T10:05:23.9864404+01:00||;True|2026-02-24T20:45:52.7533529+01:00||;True|2026-02-24T17:49:48.6739610+01:00||;True|2026-02-24T14:30:47.0663499+01:00||;True|2026-02-24T09:28:30.5328425+01:00||;True|2026-02-24T08:40:15.6054714+01:00||;True|2026-02-24T07:59:34.6469067+01:00||;True|2026-02-24T07:30:03.4506392+01:00||;True|2026-02-23T08:26:05.4681353+01:00||;True|2026-02-22T10:44:29.6270572+01:00||;True|2026-02-22T10:41:26.3016875+01:00||;True|2026-02-22T10:30:20.0395713+01:00||;True|2026-02-22T10:06:09.3728289+01:00||;True|2026-02-20T11:11:41.2906293+01:00||;True|2026-02-20T10:46:35.4015642+01:00||;True|2026-02-20T09:45:14.8833885+01:00||;True|2026-02-20T07:32:39.1940489+01:00||;True|2026-02-18T09:12:43.1434580+01:00||;True|2026-02-17T15:15:14.8805757+01:00||;True|2026-02-17T11:09:40.4786451+01:00||;True|2026-02-17T10:45:37.3358353+01:00||;True|2026-02-17T10:33:30.6184470+01:00||;True|2026-02-16T18:55:30.1424518+01:00||;True|2026-02-16T18:01:46.0478978+01:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<File Include="App_Data/TableConfig.json"> <File Include="App_Data/TableConfig.json">
<publishTime>03/20/2026 21:02:32</publishTime> <publishTime>03/25/2026 08:50:50</publishTime>
</File> </File>
<File Include="App_Data/users.json"> <File Include="App_Data/users.json">
<publishTime>03/12/2026 17:43:43</publishTime> <publishTime>03/25/2026 16:09:06</publishTime>
</File> </File>
<File Include="Areas/HelpPage/HelpPage.css"> <File Include="Areas/HelpPage/HelpPage.css">
<publishTime>03/06/2024 09:20:46</publishTime> <publishTime>03/06/2024 09:20:46</publishTime>
@@ -145,13 +145,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/20/2023 22:35:04</publishTime> <publishTime>10/20/2023 22:35:04</publishTime>
</File> </File>
<File Include="bin/DOCGEN.dll"> <File Include="bin/DOCGEN.dll">
<publishTime>03/22/2026 13:25:50</publishTime> <publishTime>01/01/0001 00:00:00</publishTime>
</File> </File>
<File Include="bin/DOCGEN.dll.config"> <File Include="bin/DOCGEN.dll.config">
<publishTime>03/11/2026 15:59:42</publishTime> <publishTime>03/11/2026 15:59:42</publishTime>
</File> </File>
<File Include="bin/DOCGEN.pdb"> <File Include="bin/DOCGEN.pdb">
<publishTime>03/22/2026 13:25:50</publishTime> <publishTime>01/01/0001 00:00:00</publishTime>
</File> </File>
<File Include="bin/FastReport.Bars.dll"> <File Include="bin/FastReport.Bars.dll">
<publishTime>11/27/2023 09:49:58</publishTime> <publishTime>11/27/2023 09:49:58</publishTime>
@@ -268,16 +268,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/03/2026 12:58:53</publishTime> <publishTime>02/03/2026 12:58:53</publishTime>
</File> </File>
<File Include="bin/OnDocOffice.dll"> <File Include="bin/OnDocOffice.dll">
<publishTime>03/22/2026 13:25:50</publishTime> <publishTime>03/26/2026 15:25:59</publishTime>
</File> </File>
<File Include="bin/OnDocOffice.pdb"> <File Include="bin/OnDocOffice.pdb">
<publishTime>03/22/2026 13:25:50</publishTime> <publishTime>03/26/2026 15:25:59</publishTime>
</File> </File>
<File Include="bin/OnDoc_NetFramework.dll"> <File Include="bin/OnDoc_NetFramework.dll">
<publishTime>03/22/2026 13:25:51</publishTime> <publishTime>03/26/2026 15:26:01</publishTime>
</File> </File>
<File Include="bin/OnDoc_NetFramework.pdb"> <File Include="bin/OnDoc_NetFramework.pdb">
<publishTime>03/22/2026 13:25:51</publishTime> <publishTime>03/26/2026 15:26:01</publishTime>
</File> </File>
<File Include="bin/Owin.dll"> <File Include="bin/Owin.dll">
<publishTime>11/13/2012 13:19:34</publishTime> <publishTime>11/13/2012 13:19:34</publishTime>
@@ -628,11 +628,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>07/19/2024 12:25:43</publishTime> <publishTime>07/19/2024 12:25:43</publishTime>
</File> </File>
<File Include="JSONViewer.aspx"> <File Include="JSONViewer.aspx">
<publishTime>03/20/2026 21:10:07</publishTime> <publishTime>03/25/2026 11:37:55</publishTime>
</File> </File>
<File Include="OnDocAPIHome.aspx"> <File Include="OnDocAPIHome.aspx">
<publishTime>01/01/0001 00:00:00</publishTime> <publishTime>01/01/0001 00:00:00</publishTime>
</File> </File>
<File Include="PDFViewer.aspx">
<publishTime>03/24/2026 14:38:16</publishTime>
</File>
<File Include="Scripts/bootstrap.bundle.js"> <File Include="Scripts/bootstrap.bundle.js">
<publishTime>03/06/2024 09:16:14</publishTime> <publishTime>03/06/2024 09:16:14</publishTime>
</File> </File>

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
0358c1c86ae90780049baadd92e8b1a6c37002f6fdab06531303b154229e8122 547a5879b1d21b43d7c36de65bf9d6e3dd3906cda020cd0d393b7de8221dc1a6

View File

@@ -20,9 +20,9 @@
"idField": "ID", "idField": "ID",
"displayField": "ID", "displayField": "ID",
"jsonField": "JsonData", "jsonField": "JsonData",
"Buttons": "Öffnen", "Buttons": "Öffnen;DokumenteAnzeigen",
"AnzeigeDokument": "", "AnzeigeDokument": "",
"FilterColumns": "GUID" "FilterColumns": "id;GUID"
}, },
{ {

View File

@@ -1,7 +1,7 @@
[ [
{ {
"UserID": "admin", "UserID": "admin",
"Password": "1234" "Password": "12345"
}, },
{ {
"UserID": "user1", "UserID": "user1",

View File

@@ -304,15 +304,30 @@ padding-bottom:20px;
} }
); );
}
function showAPIDocs(tableKey, id) {
PageMethods.gwrAPIDocs(
tableKey,
id,
function (result) {
var pdfWindow = window.open("");
pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>");
},
function (err) {
alert(err.get_message())
}
);
} }
function showPacDoc(tableKey, id) { function showPacDoc(tableKey, id) {
PageMethods.GetPacDoc( PageMethods.GetPacDoc(
tableKey, tableKey,
id, id,
function (result) { function (result) {
window.open("\PDFViewer.aspx", '_blank').focus();
var pdfWindow = window.open(""); //var pdfWindow = window.open("");
pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>"); //pdfWindow.document.write("<iframe width='100%' height='100%' src='data:application/pdf;base64," + result + "'></iframe>");
}, },
function (err) { function (err) {

View File

@@ -0,0 +1,14 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PDFViewer.aspx.cs" Inherits="OnDocAPI_NetFramework.PDFViewer" %>
<!DOCTYPE html>
<html>
<head runat="server">
<title>PDF Viewer</title>
</head>
<body>
<form id="form1" runat="server">
<!-- Optional: Falls du die PDF im selben Layout anzeigen willst -->
<iframe src="PdfViewer.aspx?inline=true" width="100%" height="800px"></iframe>
</form>
</body>
</html>

View File

@@ -65,7 +65,7 @@
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(472, 26); this.label2.Size = new System.Drawing.Size(472, 26);
this.label2.TabIndex = 2; this.label2.TabIndex = 2;
this.label2.Text = "22. März 2026"; this.label2.Text = "24. März 2026";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label2.Click += new System.EventHandler(this.label2_Click); this.label2.Click += new System.EventHandler(this.label2_Click);
// //

View File

@@ -43,11 +43,26 @@
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.grpversanddetails = new System.Windows.Forms.GroupBox();
this.panel2 = new System.Windows.Forms.Panel();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.txtgassize = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.txtanzahlseiten = new System.Windows.Forms.TextBox();
this.txtanzahldokumente = new System.Windows.Forms.TextBox();
this.txtgasadresse = new System.Windows.Forms.TextBox();
this.txtversandart = new System.Windows.Forms.TextBox();
this.panelsign = new System.Windows.Forms.Panel(); this.panelsign = new System.Windows.Forms.Panel();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.grpDetails = new System.Windows.Forms.GroupBox(); this.grpDetails = new System.Windows.Forms.GroupBox();
this.label4 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.lblnotizen = new System.Windows.Forms.Label();
this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView(); this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
this.txtNote = new System.Windows.Forms.TextBox(); this.txtNote = new System.Windows.Forms.TextBox();
this.txtnotewriter = new System.Windows.Forms.TextBox(); this.txtnotewriter = new System.Windows.Forms.TextBox();
@@ -74,6 +89,9 @@
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton(); this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.label4 = new System.Windows.Forms.Label();
this.txtcouverterstelltam = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
@@ -82,8 +100,11 @@
this.pnlsignerror.SuspendLayout(); this.pnlsignerror.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.pnlMultiThreading.SuspendLayout(); this.pnlMultiThreading.SuspendLayout();
this.grpversanddetails.SuspendLayout();
this.panel2.SuspendLayout();
this.panelsign.SuspendLayout(); this.panelsign.SuspendLayout();
this.grpDetails.SuspendLayout(); this.grpDetails.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// splitContainer1 // splitContainer1
@@ -99,13 +120,13 @@
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.Controls.Add(this.pnlMultiThreading); this.splitContainer1.Panel2.Controls.Add(this.pnlMultiThreading);
this.splitContainer1.Panel2.Controls.Add(this.grpversanddetails);
this.splitContainer1.Panel2.Controls.Add(this.panelsign); this.splitContainer1.Panel2.Controls.Add(this.panelsign);
this.splitContainer1.Panel2.Controls.Add(this.panel1);
this.splitContainer1.Panel2.Controls.Add(this.grpDetails); this.splitContainer1.Panel2.Controls.Add(this.grpDetails);
this.splitContainer1.Panel2.Controls.Add(this.docPreview1); this.splitContainer1.Panel2.Controls.Add(this.docPreview1);
this.splitContainer1.Panel2.Controls.Add(this.ribbon3); this.splitContainer1.Panel2.Controls.Add(this.ribbon3);
this.splitContainer1.Size = new System.Drawing.Size(1629, 876); this.splitContainer1.Size = new System.Drawing.Size(1629, 876);
this.splitContainer1.SplitterDistance = 300; this.splitContainer1.SplitterDistance = 298;
this.splitContainer1.TabIndex = 1; this.splitContainer1.TabIndex = 1;
// //
// groupBox1 // groupBox1
@@ -115,10 +136,11 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Location = new System.Drawing.Point(0, 0);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(300, 876); this.groupBox1.Size = new System.Drawing.Size(298, 876);
this.groupBox1.TabIndex = 0; this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Dokumente"; this.groupBox1.Text = "Dokumente";
this.groupBox1.Resize += new System.EventHandler(this.groupBox1_Resize);
// //
// pnlsignerror // pnlsignerror
// //
@@ -126,7 +148,7 @@
this.pnlsignerror.Dock = System.Windows.Forms.DockStyle.Bottom; this.pnlsignerror.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlsignerror.Location = new System.Drawing.Point(3, 773); this.pnlsignerror.Location = new System.Drawing.Point(3, 773);
this.pnlsignerror.Name = "pnlsignerror"; this.pnlsignerror.Name = "pnlsignerror";
this.pnlsignerror.Size = new System.Drawing.Size(294, 100); this.pnlsignerror.Size = new System.Drawing.Size(292, 100);
this.pnlsignerror.TabIndex = 5; this.pnlsignerror.TabIndex = 5;
this.pnlsignerror.Visible = false; this.pnlsignerror.Visible = false;
// //
@@ -220,7 +242,7 @@
treeNodeAdv1, treeNodeAdv1,
treeNodeAdv4}); treeNodeAdv4});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(294, 857); this.treeViewAdv1.Size = new System.Drawing.Size(292, 857);
this.treeViewAdv1.TabIndex = 4; this.treeViewAdv1.TabIndex = 4;
this.treeViewAdv1.Text = "treeViewAdv1"; this.treeViewAdv1.Text = "treeViewAdv1";
this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
@@ -280,6 +302,149 @@
this.label6.TabIndex = 0; this.label6.TabIndex = 0;
this.label6.Text = "Das Dokument wird signiert - bitte warten"; this.label6.Text = "Das Dokument wird signiert - bitte warten";
// //
// grpversanddetails
//
this.grpversanddetails.BackColor = System.Drawing.SystemColors.Window;
this.grpversanddetails.Controls.Add(this.label4);
this.grpversanddetails.Controls.Add(this.txtcouverterstelltam);
this.grpversanddetails.Controls.Add(this.panel2);
this.grpversanddetails.Controls.Add(this.label14);
this.grpversanddetails.Controls.Add(this.label16);
this.grpversanddetails.Controls.Add(this.txtgassize);
this.grpversanddetails.Controls.Add(this.label13);
this.grpversanddetails.Controls.Add(this.label12);
this.grpversanddetails.Controls.Add(this.label11);
this.grpversanddetails.Controls.Add(this.label10);
this.grpversanddetails.Controls.Add(this.txtanzahlseiten);
this.grpversanddetails.Controls.Add(this.txtanzahldokumente);
this.grpversanddetails.Controls.Add(this.txtgasadresse);
this.grpversanddetails.Controls.Add(this.txtversandart);
this.grpversanddetails.Location = new System.Drawing.Point(616, 284);
this.grpversanddetails.Margin = new System.Windows.Forms.Padding(0);
this.grpversanddetails.Name = "grpversanddetails";
this.grpversanddetails.Padding = new System.Windows.Forms.Padding(0);
this.grpversanddetails.Size = new System.Drawing.Size(321, 363);
this.grpversanddetails.TabIndex = 40;
this.grpversanddetails.TabStop = false;
this.grpversanddetails.Visible = false;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.Cornsilk;
this.panel2.Controls.Add(this.label17);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 13);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(321, 26);
this.panel2.TabIndex = 42;
//
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(6, 5);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(120, 17);
this.label17.TabIndex = 0;
this.label17.Text = "Couvert-Details";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(11, 136);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(45, 13);
this.label14.TabIndex = 7;
this.label14.Text = "Adresse";
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(6, 265);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(80, 13);
this.label16.TabIndex = 9;
this.label16.Text = "Couvert-Grösse";
//
// txtgassize
//
this.txtgassize.Location = new System.Drawing.Point(103, 265);
this.txtgassize.Name = "txtgassize";
this.txtgassize.ReadOnly = true;
this.txtgassize.Size = new System.Drawing.Size(203, 20);
this.txtgassize.TabIndex = 8;
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(6, 235);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(61, 13);
this.label13.TabIndex = 6;
this.label13.Text = "Anz. Seiten";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(6, 207);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(86, 13);
this.label12.TabIndex = 5;
this.label12.Text = "Anz. Dokumente";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(11, 123);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(68, 13);
this.label11.TabIndex = 5;
this.label11.Text = "Rückantwort";
this.label11.Click += new System.EventHandler(this.label11_Click);
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(10, 86);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(63, 13);
this.label10.TabIndex = 4;
this.label10.Text = "Versandsart";
this.label10.Click += new System.EventHandler(this.label10_Click);
//
// txtanzahlseiten
//
this.txtanzahlseiten.Location = new System.Drawing.Point(103, 235);
this.txtanzahlseiten.Name = "txtanzahlseiten";
this.txtanzahlseiten.ReadOnly = true;
this.txtanzahlseiten.Size = new System.Drawing.Size(203, 20);
this.txtanzahlseiten.TabIndex = 3;
//
// txtanzahldokumente
//
this.txtanzahldokumente.Location = new System.Drawing.Point(103, 204);
this.txtanzahldokumente.Name = "txtanzahldokumente";
this.txtanzahldokumente.ReadOnly = true;
this.txtanzahldokumente.Size = new System.Drawing.Size(203, 20);
this.txtanzahldokumente.TabIndex = 2;
//
// txtgasadresse
//
this.txtgasadresse.Location = new System.Drawing.Point(103, 123);
this.txtgasadresse.Multiline = true;
this.txtgasadresse.Name = "txtgasadresse";
this.txtgasadresse.ReadOnly = true;
this.txtgasadresse.Size = new System.Drawing.Size(203, 74);
this.txtgasadresse.TabIndex = 1;
//
// txtversandart
//
this.txtversandart.Location = new System.Drawing.Point(102, 83);
this.txtversandart.Name = "txtversandart";
this.txtversandart.ReadOnly = true;
this.txtversandart.Size = new System.Drawing.Size(203, 20);
this.txtversandart.TabIndex = 0;
//
// panelsign // panelsign
// //
this.panelsign.BackColor = System.Drawing.SystemColors.ActiveBorder; this.panelsign.BackColor = System.Drawing.SystemColors.ActiveBorder;
@@ -300,17 +465,11 @@
this.label5.TabIndex = 0; this.label5.TabIndex = 0;
this.label5.Text = "Das Dokument wird signiert - bitte warten"; this.label5.Text = "Das Dokument wird signiert - bitte warten";
// //
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(983, 86);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(10, 790);
this.panel1.TabIndex = 4;
//
// grpDetails // grpDetails
// //
this.grpDetails.Controls.Add(this.label4); this.grpDetails.BackColor = System.Drawing.SystemColors.Window;
this.grpDetails.Controls.Add(this.panel1);
this.grpDetails.Controls.Add(this.lblnotizen);
this.grpDetails.Controls.Add(this.sfListView1); this.grpDetails.Controls.Add(this.sfListView1);
this.grpDetails.Controls.Add(this.txtNote); this.grpDetails.Controls.Add(this.txtNote);
this.grpDetails.Controls.Add(this.txtnotewriter); this.grpDetails.Controls.Add(this.txtnotewriter);
@@ -330,22 +489,42 @@
this.grpDetails.Controls.Add(this.txtdokumentid); this.grpDetails.Controls.Add(this.txtdokumentid);
this.grpDetails.Controls.Add(this.label1); this.grpDetails.Controls.Add(this.label1);
this.grpDetails.Dock = System.Windows.Forms.DockStyle.Right; this.grpDetails.Dock = System.Windows.Forms.DockStyle.Right;
this.grpDetails.Location = new System.Drawing.Point(993, 86); this.grpDetails.Location = new System.Drawing.Point(995, 86);
this.grpDetails.Name = "grpDetails"; this.grpDetails.Name = "grpDetails";
this.grpDetails.Size = new System.Drawing.Size(332, 790); this.grpDetails.Size = new System.Drawing.Size(332, 790);
this.grpDetails.TabIndex = 3; this.grpDetails.TabIndex = 3;
this.grpDetails.TabStop = false; this.grpDetails.TabStop = false;
this.grpDetails.Text = "Details"; this.grpDetails.Visible = false;
// //
// label4 // panel1
// //
this.label4.AutoSize = true; this.panel1.BackColor = System.Drawing.Color.Cornsilk;
this.label4.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Controls.Add(this.label15);
this.label4.Location = new System.Drawing.Point(3, 356); this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.label4.Name = "label4"; this.panel1.Location = new System.Drawing.Point(3, 16);
this.label4.Size = new System.Drawing.Size(43, 13); this.panel1.Name = "panel1";
this.label4.TabIndex = 37; this.panel1.Size = new System.Drawing.Size(326, 28);
this.label4.Text = "Notizen"; this.panel1.TabIndex = 41;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label15.Location = new System.Drawing.Point(3, 5);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(58, 17);
this.label15.TabIndex = 0;
this.label15.Text = "Details";
//
// lblnotizen
//
this.lblnotizen.AutoSize = true;
this.lblnotizen.Dock = System.Windows.Forms.DockStyle.Bottom;
this.lblnotizen.Location = new System.Drawing.Point(3, 495);
this.lblnotizen.Name = "lblnotizen";
this.lblnotizen.Size = new System.Drawing.Size(43, 13);
this.lblnotizen.TabIndex = 37;
this.lblnotizen.Text = "Notizen";
// //
// sfListView1 // sfListView1
// //
@@ -353,10 +532,10 @@
this.sfListView1.AutoHideScrollBars = true; this.sfListView1.AutoHideScrollBars = true;
this.sfListView1.BackColor = System.Drawing.SystemColors.Window; this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Bottom; this.sfListView1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.sfListView1.Location = new System.Drawing.Point(3, 369); this.sfListView1.Location = new System.Drawing.Point(3, 508);
this.sfListView1.Name = "sfListView1"; this.sfListView1.Name = "sfListView1";
this.sfListView1.ShowToolTip = true; this.sfListView1.ShowToolTip = true;
this.sfListView1.Size = new System.Drawing.Size(326, 310); this.sfListView1.Size = new System.Drawing.Size(326, 171);
this.sfListView1.TabIndex = 36; this.sfListView1.TabIndex = 36;
this.sfListView1.Text = "sfListView1"; this.sfListView1.Text = "sfListView1";
this.sfListView1.VerticalScrollIncrement = 20; this.sfListView1.VerticalScrollIncrement = 20;
@@ -385,7 +564,7 @@
// //
// txtVerantwortlich // txtVerantwortlich
// //
this.txtVerantwortlich.Location = new System.Drawing.Point(88, 294); this.txtVerantwortlich.Location = new System.Drawing.Point(91, 326);
this.txtVerantwortlich.Name = "txtVerantwortlich"; this.txtVerantwortlich.Name = "txtVerantwortlich";
this.txtVerantwortlich.ReadOnly = true; this.txtVerantwortlich.ReadOnly = true;
this.txtVerantwortlich.Size = new System.Drawing.Size(230, 20); this.txtVerantwortlich.Size = new System.Drawing.Size(230, 20);
@@ -394,7 +573,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(3, 294); this.label3.Location = new System.Drawing.Point(6, 326);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 13); this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 34; this.label3.TabIndex = 34;
@@ -402,7 +581,7 @@
// //
// txtmutiertam // txtmutiertam
// //
this.txtmutiertam.Location = new System.Drawing.Point(88, 251); this.txtmutiertam.Location = new System.Drawing.Point(91, 283);
this.txtmutiertam.Name = "txtmutiertam"; this.txtmutiertam.Name = "txtmutiertam";
this.txtmutiertam.ReadOnly = true; this.txtmutiertam.ReadOnly = true;
this.txtmutiertam.Size = new System.Drawing.Size(230, 20); this.txtmutiertam.Size = new System.Drawing.Size(230, 20);
@@ -410,7 +589,7 @@
// //
// txtmutierer // txtmutierer
// //
this.txtmutierer.Location = new System.Drawing.Point(88, 225); this.txtmutierer.Location = new System.Drawing.Point(91, 257);
this.txtmutierer.Name = "txtmutierer"; this.txtmutierer.Name = "txtmutierer";
this.txtmutierer.ReadOnly = true; this.txtmutierer.ReadOnly = true;
this.txtmutierer.Size = new System.Drawing.Size(230, 20); this.txtmutierer.Size = new System.Drawing.Size(230, 20);
@@ -418,7 +597,7 @@
// //
// txtersteller // txtersteller
// //
this.txtersteller.Location = new System.Drawing.Point(88, 189); this.txtersteller.Location = new System.Drawing.Point(91, 221);
this.txtersteller.Name = "txtersteller"; this.txtersteller.Name = "txtersteller";
this.txtersteller.ReadOnly = true; this.txtersteller.ReadOnly = true;
this.txtersteller.Size = new System.Drawing.Size(230, 20); this.txtersteller.Size = new System.Drawing.Size(230, 20);
@@ -427,7 +606,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(3, 225); this.label2.Location = new System.Drawing.Point(6, 257);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(53, 13); this.label2.Size = new System.Drawing.Size(53, 13);
this.label2.TabIndex = 30; this.label2.TabIndex = 30;
@@ -435,7 +614,7 @@
// //
// txterstelltam // txterstelltam
// //
this.txterstelltam.Location = new System.Drawing.Point(88, 163); this.txterstelltam.Location = new System.Drawing.Point(91, 195);
this.txterstelltam.Name = "txterstelltam"; this.txterstelltam.Name = "txterstelltam";
this.txterstelltam.ReadOnly = true; this.txterstelltam.ReadOnly = true;
this.txterstelltam.Size = new System.Drawing.Size(230, 20); this.txterstelltam.Size = new System.Drawing.Size(230, 20);
@@ -444,7 +623,7 @@
// Erstellung // Erstellung
// //
this.Erstellung.AutoSize = true; this.Erstellung.AutoSize = true;
this.Erstellung.Location = new System.Drawing.Point(3, 166); this.Erstellung.Location = new System.Drawing.Point(6, 198);
this.Erstellung.Name = "Erstellung"; this.Erstellung.Name = "Erstellung";
this.Erstellung.Size = new System.Drawing.Size(53, 13); this.Erstellung.Size = new System.Drawing.Size(53, 13);
this.Erstellung.TabIndex = 28; this.Erstellung.TabIndex = 28;
@@ -452,7 +631,7 @@
// //
// txtPartner // txtPartner
// //
this.txtPartner.Location = new System.Drawing.Point(88, 117); this.txtPartner.Location = new System.Drawing.Point(91, 149);
this.txtPartner.Name = "txtPartner"; this.txtPartner.Name = "txtPartner";
this.txtPartner.ReadOnly = true; this.txtPartner.ReadOnly = true;
this.txtPartner.Size = new System.Drawing.Size(230, 20); this.txtPartner.Size = new System.Drawing.Size(230, 20);
@@ -460,7 +639,7 @@
// //
// txtPartnerNr // txtPartnerNr
// //
this.txtPartnerNr.Location = new System.Drawing.Point(88, 91); this.txtPartnerNr.Location = new System.Drawing.Point(91, 123);
this.txtPartnerNr.Name = "txtPartnerNr"; this.txtPartnerNr.Name = "txtPartnerNr";
this.txtPartnerNr.ReadOnly = true; this.txtPartnerNr.ReadOnly = true;
this.txtPartnerNr.Size = new System.Drawing.Size(163, 20); this.txtPartnerNr.Size = new System.Drawing.Size(163, 20);
@@ -469,7 +648,7 @@
// lblPartner // lblPartner
// //
this.lblPartner.AutoSize = true; this.lblPartner.AutoSize = true;
this.lblPartner.Location = new System.Drawing.Point(3, 94); this.lblPartner.Location = new System.Drawing.Point(6, 124);
this.lblPartner.Name = "lblPartner"; this.lblPartner.Name = "lblPartner";
this.lblPartner.Size = new System.Drawing.Size(41, 13); this.lblPartner.Size = new System.Drawing.Size(41, 13);
this.lblPartner.TabIndex = 25; this.lblPartner.TabIndex = 25;
@@ -477,7 +656,7 @@
// //
// txtbezeichnung // txtbezeichnung
// //
this.txtbezeichnung.Location = new System.Drawing.Point(88, 50); this.txtbezeichnung.Location = new System.Drawing.Point(91, 82);
this.txtbezeichnung.Name = "txtbezeichnung"; this.txtbezeichnung.Name = "txtbezeichnung";
this.txtbezeichnung.ReadOnly = true; this.txtbezeichnung.ReadOnly = true;
this.txtbezeichnung.Size = new System.Drawing.Size(230, 20); this.txtbezeichnung.Size = new System.Drawing.Size(230, 20);
@@ -486,7 +665,7 @@
// Bezeichnung // Bezeichnung
// //
this.Bezeichnung.AutoSize = true; this.Bezeichnung.AutoSize = true;
this.Bezeichnung.Location = new System.Drawing.Point(3, 53); this.Bezeichnung.Location = new System.Drawing.Point(6, 85);
this.Bezeichnung.Name = "Bezeichnung"; this.Bezeichnung.Name = "Bezeichnung";
this.Bezeichnung.Size = new System.Drawing.Size(69, 13); this.Bezeichnung.Size = new System.Drawing.Size(69, 13);
this.Bezeichnung.TabIndex = 23; this.Bezeichnung.TabIndex = 23;
@@ -494,7 +673,7 @@
// //
// txtdokumentid // txtdokumentid
// //
this.txtdokumentid.Location = new System.Drawing.Point(88, 24); this.txtdokumentid.Location = new System.Drawing.Point(91, 56);
this.txtdokumentid.Name = "txtdokumentid"; this.txtdokumentid.Name = "txtdokumentid";
this.txtdokumentid.ReadOnly = true; this.txtdokumentid.ReadOnly = true;
this.txtdokumentid.Size = new System.Drawing.Size(163, 20); this.txtdokumentid.Size = new System.Drawing.Size(163, 20);
@@ -503,7 +682,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(3, 27); this.label1.Location = new System.Drawing.Point(6, 59);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(70, 13); this.label1.Size = new System.Drawing.Size(70, 13);
this.label1.TabIndex = 21; this.label1.TabIndex = 21;
@@ -514,7 +693,7 @@
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Left; this.docPreview1.Dock = System.Windows.Forms.DockStyle.Left;
this.docPreview1.Location = new System.Drawing.Point(0, 86); this.docPreview1.Location = new System.Drawing.Point(0, 86);
this.docPreview1.Name = "docPreview1"; this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1083, 790); this.docPreview1.Size = new System.Drawing.Size(333, 790);
this.docPreview1.TabIndex = 0; this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0; this.docPreview1.ZoomPercentage = 0;
// //
@@ -536,7 +715,7 @@
this.ribbon3.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon3.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon3.OrbVisible = false; this.ribbon3.OrbVisible = false;
this.ribbon3.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); this.ribbon3.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon3.Size = new System.Drawing.Size(1325, 86); this.ribbon3.Size = new System.Drawing.Size(1327, 86);
this.ribbon3.TabIndex = 2; this.ribbon3.TabIndex = 2;
this.ribbon3.Tabs.Add(this.ribbonTab1); this.ribbon3.Tabs.Add(this.ribbonTab1);
this.ribbon3.TabSpacing = 4; this.ribbon3.TabSpacing = 4;
@@ -591,6 +770,23 @@
this.ribbonButton1.Text = "Aktualisieren"; this.ribbonButton1.Text = "Aktualisieren";
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
// //
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(11, 59);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(55, 13);
this.label4.TabIndex = 44;
this.label4.Text = "Erstellt am";
//
// txtcouverterstelltam
//
this.txtcouverterstelltam.Location = new System.Drawing.Point(102, 56);
this.txtcouverterstelltam.Name = "txtcouverterstelltam";
this.txtcouverterstelltam.ReadOnly = true;
this.txtcouverterstelltam.Size = new System.Drawing.Size(203, 20);
this.txtcouverterstelltam.TabIndex = 43;
//
// Approval // Approval
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -598,6 +794,7 @@
this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitContainer1);
this.Name = "Approval"; this.Name = "Approval";
this.Size = new System.Drawing.Size(1629, 876); this.Size = new System.Drawing.Size(1629, 876);
this.SizeChanged += new System.EventHandler(this.Approval_SizeChanged);
this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
@@ -607,10 +804,16 @@
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit();
this.pnlMultiThreading.ResumeLayout(false); this.pnlMultiThreading.ResumeLayout(false);
this.pnlMultiThreading.PerformLayout(); this.pnlMultiThreading.PerformLayout();
this.grpversanddetails.ResumeLayout(false);
this.grpversanddetails.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panelsign.ResumeLayout(false); this.panelsign.ResumeLayout(false);
this.panelsign.PerformLayout(); this.panelsign.PerformLayout();
this.grpDetails.ResumeLayout(false); this.grpDetails.ResumeLayout(false);
this.grpDetails.PerformLayout(); this.grpDetails.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@@ -626,7 +829,7 @@
private System.Windows.Forms.RibbonButton ribbonButtonApproved; private System.Windows.Forms.RibbonButton ribbonButtonApproved;
private System.Windows.Forms.RibbonButton ribbonButtonNotApproved; private System.Windows.Forms.RibbonButton ribbonButtonNotApproved;
private System.Windows.Forms.GroupBox grpDetails; private System.Windows.Forms.GroupBox grpDetails;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label lblnotizen;
private Syncfusion.WinForms.ListView.SfListView sfListView1; private Syncfusion.WinForms.ListView.SfListView sfListView1;
private System.Windows.Forms.TextBox txtVerantwortlich; private System.Windows.Forms.TextBox txtVerantwortlich;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
@@ -645,7 +848,6 @@
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtNote; private System.Windows.Forms.TextBox txtNote;
private System.Windows.Forms.TextBox txtnotewriter; private System.Windows.Forms.TextBox txtnotewriter;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.RibbonPanel ribbonPanel2; private System.Windows.Forms.RibbonPanel ribbonPanel2;
private System.Windows.Forms.RibbonButton ribbonButton1; private System.Windows.Forms.RibbonButton ribbonButton1;
private System.Windows.Forms.Panel panelsign; private System.Windows.Forms.Panel panelsign;
@@ -657,5 +859,24 @@
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Panel pnlsignerror; private System.Windows.Forms.Panel pnlsignerror;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.ComponentModel.BackgroundWorker backgroundWorker1;
private System.Windows.Forms.GroupBox grpversanddetails;
private System.Windows.Forms.TextBox txtversandart;
private System.Windows.Forms.TextBox txtanzahlseiten;
private System.Windows.Forms.TextBox txtanzahldokumente;
private System.Windows.Forms.TextBox txtgasadresse;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtgassize;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtcouverterstelltam;
} }
} }

View File

@@ -95,18 +95,48 @@ namespace OnDoc.UIControls
try try
{ {
if (nodetag.Contains("(Paket)")) docPreview1.Width = splitContainer1.Panel2.Width - grpDetails.Width - 5;
grpversanddetails.Left = grpDetails.Left;
grpversanddetails.Top= grpDetails.Top;
grpversanddetails.Width = grpDetails.Width;
grpversanddetails.Visible = false;
grpversanddetails.Dock = DockStyle.Right;
grpDetails.Dock = DockStyle.Right;
if (nodetag.Contains("Couvert)"))
{ {
string pid = nodetag.Substring(0, nodetag.Length - 7);
grpDetails.Visible = false; grpDetails.Visible = false;
string pid = nodetag.Substring(0, nodetag.Length - 9);
//grpDetails.Visible = false;
DB dB = new DB(AppParams.connectionstring); DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata("Select paket from ondoc_versandstrasse_paket where id = " + pid.ToString(), false, true); dB.Get_Tabledata("Select paket, erstellt_am from ondoc_versandstrasse_paket where id = " + pid.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dB.dsdaten.Tables[0].Rows[0]["paket"].ToString()); Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dB.dsdaten.Tables[0].Rows[0]["paket"].ToString());
this.docPreview1.Show_Doc(vp.finaldoc); this.docPreview1.Show_Doc(vp.finaldoc);
// vp = null; try
{
txtcouverterstelltam.Text = "";
txtversandart.Text = "";
txtgasadresse.Text = "";
txtanzahldokumente.Text = "";
txtanzahldokumente.Text = "";
txtanzahlseiten.Text = "";
txtgassize.Text = "";
txtversandart.Text = vp.Versandoption;
txtcouverterstelltam.Text=dB.dsdaten.Tables[0].Rows[0]["erstellt_am"].ToString();
txtgasadresse.Text = vp.GASAdresse.Replace(";",Environment.NewLine);
txtanzahldokumente.Text = vp.Dokument.Count.ToString();
txtanzahlseiten.Text= this.docPreview1.Get_Page_Count().ToString();
txtgassize.Text = vp.GASSize.ToString();
}
catch { }
grpversanddetails.Visible = true;
grpversanddetails.Dock = DockStyle.Right;
vp = null;
this.docPreview1.Width = this.Width - grpversanddetails.Width - groupBox1.Width-10;
dB = null;
return; return;
} }
grpDetails.Visible = true; grpDetails.Visible = true;
this.docPreview1.Width = this.Width - grpDetails.Width - groupBox1.Width-10;
notes.Rows.Clear(); ; notes.Rows.Clear(); ;
notes.Columns.Clear(); notes.Columns.Clear();
notes.AcceptChanges(); notes.AcceptChanges();
@@ -214,8 +244,8 @@ namespace OnDoc.UIControls
} }
TreeNodeAdv tndok = new TreeNodeAdv(); TreeNodeAdv tndok = new TreeNodeAdv();
tndok.Text = "Dokumentpaket - " + dr["Bezeichnung"].ToString(); tndok.Text = "Versand-Couvert - " + dr["Bezeichnung"].ToString();
tndok.Tag = dr["paketid"].ToString() + "(Paket)"; tndok.Tag = dr["paketid"].ToString() + "(Couvert)";
tndok.TagObject = dr; tndok.TagObject = dr;
tnpartner.Nodes.Add(tndok); tnpartner.Nodes.Add(tndok);
} }
@@ -239,10 +269,10 @@ namespace OnDoc.UIControls
if (note.ShowDialog() == DialogResult.OK) if (note.ShowDialog() == DialogResult.OK)
{ {
DB db = new DB(AppParams.connectionstring); DB db = new DB(AppParams.connectionstring);
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)")) if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Couvert)"))
{ {
string pid = treeViewAdv1.SelectedNode.Tag.ToString(); string pid = treeViewAdv1.SelectedNode.Tag.ToString();
pid = pid.Substring(0, pid.Length - 7); pid = pid.Substring(0, pid.Length - 9);
DB db1 = new DB(AppParams.connectionstring); DB db1 = new DB(AppParams.connectionstring);
db1.clear_parameter(); db1.clear_parameter();
db1.add_parameter("@paketid", pid); db1.add_parameter("@paketid", pid);
@@ -446,10 +476,10 @@ namespace OnDoc.UIControls
int error = 0; int error = 0;
int approvaltype = 0; int approvaltype = 0;
this.pnlsignerror.Visible = false; this.pnlsignerror.Visible = false;
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)")) if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Couvert)"))
{ {
string pid = treeViewAdv1.SelectedNode.Tag.ToString(); string pid = treeViewAdv1.SelectedNode.Tag.ToString();
pid = pid.Substring(0,pid.Length - 7); pid = pid.Substring(0,pid.Length - 9);
DB db1 = new DB(AppParams.connectionstring); DB db1 = new DB(AppParams.connectionstring);
db1.clear_parameter(); db1.clear_parameter();
db1.add_parameter("@paketid", pid); db1.add_parameter("@paketid", pid);
@@ -666,5 +696,28 @@ namespace OnDoc.UIControls
} }
catch { } catch { }
} }
private void label10_Click(object sender, EventArgs e)
{
}
private void label11_Click(object sender, EventArgs e)
{
}
private void groupBox1_Resize(object sender, EventArgs e)
{
}
private void Approval_SizeChanged(object sender, EventArgs e)
{
this.docPreview1.Width = this.Width - grpDetails.Width - groupBox1.Width - 10;
int i = txtVerantwortlich.Top + txtVerantwortlich.Height;
i = txtNote.Top - i;
this.sfListView1.Height = i - lblnotizen.Height-10;
}
} }
} }

View File

@@ -320,4 +320,10 @@
b2sUjBbOAAAAAElFTkSuQmCC b2sUjBbOAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root> </root>

View File

@@ -69,6 +69,7 @@ namespace OnDoc.UIControls
clsdok dok = new clsdok("", "", "",""); clsdok dok = new clsdok("", "", "","");
if (dokumentid.Length > 25) { if (dokumentid.Length > 25) {
dok.dokument = dokumentid; dok.dokument = dokumentid;
} else } else
{ {

View File

@@ -547,6 +547,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ShowGroupDropArea = true; this.sfDataGrid1.ShowGroupDropArea = true;
this.sfDataGrid1.ShowToolTip = true; this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(1709, 341); this.sfDataGrid1.Size = new System.Drawing.Size(1709, 341);
this.sfDataGrid1.Style.DragPreviewRowStyle.Font = new System.Drawing.Font("Segoe UI", 9F);
this.sfDataGrid1.TabIndex = 0; this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.ValidationMode = Syncfusion.WinForms.DataGrid.Enums.GridValidationMode.InView; this.sfDataGrid1.ValidationMode = Syncfusion.WinForms.DataGrid.Enums.GridValidationMode.InView;
this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1); this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1);

View File

@@ -835,8 +835,10 @@
// //
// //
// //
this.treeViewAdv1.HelpTextControl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.treeViewAdv1.HelpTextControl.BaseThemeName = null; this.treeViewAdv1.HelpTextControl.BaseThemeName = null;
this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.HelpTextControl.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdv1.HelpTextControl.Name = "helpText"; this.treeViewAdv1.HelpTextControl.Name = "helpText";
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15); this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15);
@@ -874,6 +876,7 @@
this.treeViewAdv1.ToolTipControl.BackColor = System.Drawing.SystemColors.Info; this.treeViewAdv1.ToolTipControl.BackColor = System.Drawing.SystemColors.Info;
this.treeViewAdv1.ToolTipControl.BaseThemeName = null; this.treeViewAdv1.ToolTipControl.BaseThemeName = null;
this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ToolTipControl.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdv1.ToolTipControl.Name = "toolTip"; this.treeViewAdv1.ToolTipControl.Name = "toolTip";
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15); this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15);
@@ -1064,8 +1067,10 @@
// //
// //
// //
this.treeViewAdvCouverts.HelpTextControl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.treeViewAdvCouverts.HelpTextControl.BaseThemeName = null; this.treeViewAdvCouverts.HelpTextControl.BaseThemeName = null;
this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.HelpTextControl.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdvCouverts.HelpTextControl.Name = "helpText"; this.treeViewAdvCouverts.HelpTextControl.Name = "helpText";
this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15); this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15);
@@ -1103,6 +1108,7 @@
this.treeViewAdvCouverts.ToolTipControl.BackColor = System.Drawing.SystemColors.Info; this.treeViewAdvCouverts.ToolTipControl.BackColor = System.Drawing.SystemColors.Info;
this.treeViewAdvCouverts.ToolTipControl.BaseThemeName = null; this.treeViewAdvCouverts.ToolTipControl.BaseThemeName = null;
this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ToolTipControl.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip"; this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip";
this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15); this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15);
@@ -1161,7 +1167,7 @@
this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon1.OrbVisible = false; this.ribbon1.OrbVisible = false;
this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon1.Size = new System.Drawing.Size(1589, 121); this.ribbon1.Size = new System.Drawing.Size(1921, 118);
this.ribbon1.TabIndex = 21; this.ribbon1.TabIndex = 21;
this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.Tabs.Add(this.ribbonTab2); this.ribbon1.Tabs.Add(this.ribbonTab2);
@@ -1477,7 +1483,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1593, 813); this.ClientSize = new System.Drawing.Size(1925, 1056);
this.Controls.Add(this.panelPrepare); this.Controls.Add(this.panelPrepare);
this.Controls.Add(this.lblpostausgang); this.Controls.Add(this.lblpostausgang);
this.Controls.Add(this.lblserienbrief); this.Controls.Add(this.lblserienbrief);

View File

@@ -1255,7 +1255,7 @@ namespace OnDoc.Versandstrasse
{ {
if (showmessage) if (showmessage)
{ {
MessageBox.Show("Paket an Versandstrasse übergeben", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Couvert an Versandstrasse übergeben", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Information);
treeViewAdv1.SelectedNode.Remove(); treeViewAdv1.SelectedNode.Remove();
} }
} }
@@ -1491,7 +1491,7 @@ namespace OnDoc.Versandstrasse
{ {
if (this.ribbonbuttondokpreviewpostkorb.Checked) if (this.ribbonbuttondokpreviewpostkorb.Checked)
{ {
System.IO.File.WriteAllText(@"y:\base64pdf1.json", node.TagObject.ToString());
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString())); var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream); this.pdfViewerControl2.Load(stream);
stream = null; stream = null;

View File

@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAAWABAQFgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo DAAAAk1TRnQBSQFMAgEBBgEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo DAAAAk1TRnQBSQFMAgEBBQEAAYgBAQGIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -355,7 +355,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
CQAAAk1TRnQBSQFMAgEBAwEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CQAAAk1TRnQBSQFMAgEBAwEAAUgBAQFIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -418,6 +418,9 @@
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>763, 17</value> <value>763, 17</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>81</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAUAAAAAAAEAIABcjwAAVgAAADAwAAABACAAqCUAALKPAAAgIAAAAQAgAKgQAABatQAAGBgAAAEA AAABAAUAAAAAAAEAIABcjwAAVgAAADAwAAABACAAqCUAALKPAAAgIAAAAQAgAKgQAABatQAAGBgAAAEA

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1464,7 +1464,20 @@ namespace DOCGEN.Klassen
bool hassignature = false; bool hassignature = false;
foreach (attribute apivalue in docdata.APIValues) foreach (attribute apivalue in docdata.APIValues)
{ {
// apivalue.Value = apivalue.Value.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", Environment.NewLine);
// if (apivalue.Value.Contains("\n"))
// {
// int i = 0;
// }
//if (apivalue.Value.Contains("<pdel;"))
//{
// apivalue.Value = apivalue.Value.Replace("\n", Environment.NewLine);
//}
if (apivalue.Value.Contains("<ol>"))
{
apivalue.Value = apivalue.Value.Replace("<ol>", "");
apivalue.Value = apivalue.Value.Replace("\n", Environment.NewLine);
}
try try
{ {
if (string.IsNullOrEmpty(apivalue.Type)) { apivalue.Type = ""; } if (string.IsNullOrEmpty(apivalue.Type)) { apivalue.Type = ""; }
@@ -1503,6 +1516,7 @@ namespace DOCGEN.Klassen
} }
else else
{ {
if (apivalue.Value.Contains("</i>")) if (apivalue.Value.Contains("</i>"))
{ {
string leftpart = apivalue.Value.Substring(0, apivalue.Value.IndexOf("<i>")); string leftpart = apivalue.Value.Substring(0, apivalue.Value.IndexOf("<i>"));
@@ -1522,12 +1536,14 @@ namespace DOCGEN.Klassen
{ {
if (!apivalue.Value.Contains("<pdel;")) if (!apivalue.Value.Contains("<pdel;"))
{ {
apivalue.Value=apivalue.Value.Replace("\n", Environment.NewLine);
BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document); BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
bookmarkNavigator.MoveToBookmark(apivalue.Tag); bookmarkNavigator.MoveToBookmark(apivalue.Tag);
bookmarkNavigator.ReplaceBookmarkContent(apivalue.Value, true); bookmarkNavigator.ReplaceBookmarkContent(apivalue.Value, true);
} }
else else
{ {
string[] delparams = apivalue.Value.Split(new string[] { "<pdel;" }, StringSplitOptions.None); string[] delparams = apivalue.Value.Split(new string[] { "<pdel;" }, StringSplitOptions.None);
string[] delparam = delparams[1].ToString().Split(';'); string[] delparam = delparams[1].ToString().Split(';');
int delstart = Convert.ToInt32(delparam[0].ToString().Substring(0, delparam[0].IndexOf(">"))); int delstart = Convert.ToInt32(delparam[0].ToString().Substring(0, delparam[0].IndexOf(">")));
@@ -1563,7 +1579,7 @@ namespace DOCGEN.Klassen
if (fullText.Contains("<PageBreak>")) if (fullText.Contains("<PageBreak>"))
{ {
//paragraph.Text = ""; //paragraph.Text = "";
fullText = fullText.Replace("<PageBreak>", "");
paragraph.AppendBreak(BreakType.PageBreak); paragraph.AppendBreak(BreakType.PageBreak);
} }
if (fullText.Contains("<li;")) if (fullText.Contains("<li;"))

Binary file not shown.

Binary file not shown.

View File

@@ -1,33 +1,34 @@
using Database; using Database;
using DOCGEN.Klassen;
using Helper;
using Model;
using OnDocOffice;
using SkiaSharp;
using Syncfusion.DocIO;
using Syncfusion.DocIO.DLS; using Syncfusion.DocIO.DLS;
using Syncfusion.ExcelToPdfConverter;
using Syncfusion.Pdf;
using Syncfusion.Pdf.Parsing;
using Syncfusion.XlsIO;
using Syncfusion.XlsIO.Parser.Biff_Records;
using System; using System;
using System.Buffers.Text;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using Syncfusion.DocIO;
using Syncfusion.Pdf;
using Syncfusion.XlsIO;
using static System.Net.Mime.MediaTypeNames;
using Syncfusion.Pdf.Parsing;
using System.Xml.Linq;
using Model;
using SkiaSharp;
using System.Web;
using System.Net;
using System.Security.Policy; using System.Security.Policy;
using DOCGEN.Klassen; using System.Text;
using System.Data;
using Helper;
using Syncfusion.XlsIO.Parser.Biff_Records;
using System.Buffers.Text;
using Syncfusion.ExcelToPdfConverter;
using OnDocOffice;
using System.Globalization;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using System.Web;
using System.Xml.Linq;
using static System.Net.Mime.MediaTypeNames;
using static System.Net.WebRequestMethods;
namespace DOCGEN namespace DOCGEN
@@ -356,7 +357,7 @@ namespace DOCGEN
public string Convert_Word_To_PDF(string document, DataTable pdfparameters = null, bool useseettings = false , bool updatefields=true) public string Convert_Word_To_PDF(string document, DataTable pdfparameters = null, bool useseettings = false , bool updatefields=true)
{ {
//Dokument erstellen //Dokument erstellen
var streamword = new MemoryStream(Convert.FromBase64String(document)); var streamword = new MemoryStream(Convert.FromBase64String(document));
@@ -373,6 +374,7 @@ namespace DOCGEN
using (Syncfusion.DocToPDFConverter.DocToPDFConverter converter = new Syncfusion.DocToPDFConverter.DocToPDFConverter()) using (Syncfusion.DocToPDFConverter.DocToPDFConverter converter = new Syncfusion.DocToPDFConverter.DocToPDFConverter())
{ {
converter.Settings.EmbedFonts = true; converter.Settings.EmbedFonts = true;
// converter.Settings.OptimizeIdenticalImages = false;
if (useseettings) if (useseettings)
{ {
converter.Settings.UpdateDocumentFields = updatefields; converter.Settings.UpdateDocumentFields = updatefields;
@@ -381,6 +383,7 @@ namespace DOCGEN
converter.Settings.ImageResolution = 640; converter.Settings.ImageResolution = 640;
converter.Settings.ImageQuality = 100; converter.Settings.ImageQuality = 100;
converter.Settings.PreserveFormFields = true; converter.Settings.PreserveFormFields = true;
} }
else else
{ {
@@ -390,6 +393,7 @@ namespace DOCGEN
converter.Settings.ImageResolution = 640; converter.Settings.ImageResolution = 640;
converter.Settings.ImageQuality = 100; converter.Settings.ImageQuality = 100;
//foreach (WSection section in wordDocument.Sections) //foreach (WSection section in wordDocument.Sections)
//{ //{
// section.PageSetup.PageSize = PageSize.A4; // section.PageSetup.PageSize = PageSize.A4;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+49ecd6624ad5557764dbeabbbcb3d8b780936b0f")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+399d63bc690e076265150d30f815a0eafa89aa1a")]
[assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@@ -1 +1 @@
569ad9dcffd0817d53aeb08a7afa49ad0306c41e7d2c0cc53b4fb6f2dd971256 1e36a9788af1afd3974b192d934184acfd9313f729d7a1d0eaf6d240370119df

View File

@@ -49,7 +49,7 @@ namespace OnDoc_Paketversand
string sql = "SELECT dbo.Ondoc_Versandstrasse_Paket.id, dbo.Ondoc_Versandstrasse_Paket.paket, dbo.Ondoc_Versandstrasse_Paket.ersteller, dbo.mitarbeiter.email"; string sql = "SELECT dbo.Ondoc_Versandstrasse_Paket.id, dbo.Ondoc_Versandstrasse_Paket.paket, dbo.Ondoc_Versandstrasse_Paket.ersteller, dbo.mitarbeiter.email";
sql = sql + " FROM dbo.Ondoc_Versandstrasse_Paket INNER JOIN dbo.mitarbeiter ON dbo.Ondoc_Versandstrasse_Paket.ersteller = dbo.mitarbeiter.mitarbeiternr"; sql = sql + " FROM dbo.Ondoc_Versandstrasse_Paket INNER JOIN dbo.mitarbeiter ON dbo.Ondoc_Versandstrasse_Paket.ersteller = dbo.mitarbeiter.mitarbeiternr";
sql = sql + " where (dbo.Ondoc_Versandstrasse_Paket.versendet = 0) AND (dbo.Ondoc_Versandstrasse_Paket.geloescht = 0) AND (dbo.Ondoc_Versandstrasse_Paket.aktiv = 1 and (isnull(signed,1)=1)"; sql = sql + " where (dbo.Ondoc_Versandstrasse_Paket.versendet = 0) AND (dbo.Ondoc_Versandstrasse_Paket.geloescht = 0) AND (dbo.Ondoc_Versandstrasse_Paket.aktiv = 1 and (isnull(signed,1)=1)) ";
sql = sql + " ORDER BY dbo.Ondoc_Versandstrasse_Paket.Versandoption"; sql = sql + " ORDER BY dbo.Ondoc_Versandstrasse_Paket.Versandoption";
Get_Tabledata(sql, false, true); Get_Tabledata(sql, false, true);
int total = 0; int total = 0;

Binary file not shown.

View File

@@ -1,4 +1,11 @@
using System; using edoka_dms;
using Model;
using Syncfusion.Pdf;
using Syncfusion.Pdf.Graphics;
using Syncfusion.Pdf.Graphics.Fonts;
using Syncfusion.Pdf.Parsing;
using Syncfusion.XPS;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Data.SqlTypes; using System.Data.SqlTypes;
@@ -17,14 +24,8 @@ using System.Security.Policy;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq;
using System.Xml.Serialization; using System.Xml.Serialization;
using edoka_dms;
using Model;
using Syncfusion.Pdf;
using Syncfusion.Pdf.Graphics;
using Syncfusion.Pdf.Graphics.Fonts;
using Syncfusion.Pdf.Parsing;
using Syncfusion.XPS;
namespace Versandstrasse namespace Versandstrasse
@@ -90,11 +91,121 @@ namespace Versandstrasse
// inhalt = DateTime.Now + " / " + inhalt; // inhalt = DateTime.Now + " / " + inhalt;
//System.IO.File.AppendAllText(@"h:\edoka_work\vs.log", Environment.NewLine + inhalt); //System.IO.File.AppendAllText(@"h:\edoka_work\vs.log", Environment.NewLine + inhalt);
} }
public string FixPageBreaks(string base64Pdf)
{
byte[] inputBytes = Convert.FromBase64String(base64Pdf);
using (MemoryStream inputStream = new MemoryStream(inputBytes))
using (MemoryStream outputStream = new MemoryStream())
{
PdfLoadedDocument loadedDoc = new PdfLoadedDocument(inputStream);
int lastBreakIndex = 0;
PageOrientation? lastOrientation = null;
int i = 0;
while (i < loadedDoc.Pages.Count)
{
PdfLoadedPage page = loadedDoc.Pages[i] as PdfLoadedPage;
var size = page.Size;
var rotation = page.Rotation;
bool isLandscape = IsLandscape(size.Width, size.Height, rotation);
var currentOrientation = isLandscape ? PageOrientation.Landscape : PageOrientation.Portrait;
if (lastOrientation == null)
{
lastOrientation = currentOrientation;
i++;
continue;
}
// Wechsel erkannt
if (currentOrientation != lastOrientation)
{
int pagesSinceBreak = i - lastBreakIndex;
if (pagesSinceBreak % 2 != 0)
{
// Leere Seite mit gleicher Größe wie vorherige Seite einfügen
PdfLoadedPage prevPage = loadedDoc.Pages[i - 1] as PdfLoadedPage;
var prevSize = prevPage.Size;
loadedDoc.Pages.Insert(i, prevSize);
i++; // überspringe eingefügte Seite
}
lastBreakIndex = i;
lastOrientation = currentOrientation;
}
i++;
}
// 🔥 NEU: Prüfung nach letztem Umbruch
int remainingPages = loadedDoc.Pages.Count - lastBreakIndex;
if (remainingPages % 2 != 0 && loadedDoc.Pages.Count > 0)
{
PdfLoadedPage lastPage = loadedDoc.Pages[loadedDoc.Pages.Count - 1] as PdfLoadedPage;
var lastSize = lastPage.Size;
loadedDoc.Pages.Add(lastSize);
}
loadedDoc.Save(outputStream);
loadedDoc.Close(true);
return Convert.ToBase64String(outputStream.ToArray());
}
}
private bool IsLandscape(float width, float height, PdfPageRotateAngle rotation)
{
bool landscape = width > height;
// Rotation berücksichtigen (90° / 270° drehen Orientierung)
if (rotation == PdfPageRotateAngle.RotateAngle90 ||
rotation == PdfPageRotateAngle.RotateAngle270)
{
landscape = !landscape;
}
return landscape;
}
// =========================================================
// 📄 A4 erkennen (mit Toleranz)
// =========================================================
private bool IsA4(PdfLoadedPage page)
{
const float tolerance = 5f;
float w = page.Size.Width;
float h = page.Size.Height;
return
(Math.Abs(w - 842f) < tolerance && Math.Abs(h - 595f) < tolerance) ||
(Math.Abs(w - 595f) < tolerance && Math.Abs(h - 842f) < tolerance);
}
enum PageOrientation
{
Portrait,
Landscape
}
public string check_pdf_pages(string dokument) public string check_pdf_pages(string dokument)
{ {
return FixPageBreaks(dokument);
var stream = new MemoryStream(Convert.FromBase64String(dokument)); var stream = new MemoryStream(Convert.FromBase64String(dokument));
PdfLoadedDocument loadedDocument = new PdfLoadedDocument(stream); PdfLoadedDocument loadedDocument = new PdfLoadedDocument(stream);
if (loadedDocument.Pages.Count % 2 == 0) { } else { Add_EmptyPage(ref loadedDocument); } if (loadedDocument.Pages.Count % 2 == 0) { } else { Add_EmptyPage(ref loadedDocument); }
MemoryStream outputStream = new MemoryStream(); MemoryStream outputStream = new MemoryStream();
string dok = ""; string dok = "";
@@ -608,6 +719,7 @@ namespace Versandstrasse
} }
private void Add_EmptyPage(ref PdfLoadedDocument document) private void Add_EmptyPage(ref PdfLoadedDocument document)
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -4,6 +4,26 @@
<name>DOCGEN</name> <name>DOCGEN</name>
</assembly> </assembly>
<members> <members>
<member name="M:DOCGEN.Klassen.SyncFWord.ReplaceLineBreakWithPara(Syncfusion.DocIO.DLS.WordDocument)">
<summary>
Replace the line breaks with paragraph marks in the Word document.
</summary>
</member>
<member name="M:DOCGEN.Klassen.SyncFWord.IterateTextBody(Syncfusion.DocIO.DLS.WTextBody)">
<summary>
Iterate text body child elements.
</summary>
</member>
<member name="M:DOCGEN.Klassen.SyncFWord.IterateTable1(Syncfusion.DocIO.DLS.WTable)">
<summary>
Iterate table child elements.
</summary>
</member>
<member name="M:DOCGEN.Klassen.SyncFWord.IterateParagraphItems(Syncfusion.DocIO.DLS.ParagraphItemCollection)">
<summary>
Iterate paragraph child elements.
</summary>
</member>
<member name="M:DOCGEN.Klassen.SyncFWord.DocToPDF(System.String)"> <member name="M:DOCGEN.Klassen.SyncFWord.DocToPDF(System.String)">
<summary>Word to PDF-Konverter</summary> <summary>Word to PDF-Konverter</summary>
<remarks>Das sind die Remarks</remarks> <remarks>Das sind die Remarks</remarks>

Binary file not shown.

Binary file not shown.