Update 20260130
This commit is contained in:
@@ -330,6 +330,7 @@ namespace API_NetFramework.Controllers
|
|||||||
onbasedoc.attributes.Add(na);
|
onbasedoc.attributes.Add(na);
|
||||||
}
|
}
|
||||||
onbasedoc.dokumentDatei = dok.dokument;
|
onbasedoc.dokumentDatei = dok.dokument;
|
||||||
|
|
||||||
|
|
||||||
if (pdfdoc != "")
|
if (pdfdoc != "")
|
||||||
{
|
{
|
||||||
@@ -712,6 +713,7 @@ namespace API_NetFramework.Controllers
|
|||||||
onbasedoc.dokumentDatum = db.dsdaten.Tables[0].Rows[0]["DokumentDatum"].ToString();
|
onbasedoc.dokumentDatum = db.dsdaten.Tables[0].Rows[0]["DokumentDatum"].ToString();
|
||||||
onbasedoc.dokumentTyp = db.dsdaten.Tables[0].Rows[0]["dokumenttyp"].ToString();
|
onbasedoc.dokumentTyp = db.dsdaten.Tables[0].Rows[0]["dokumenttyp"].ToString();
|
||||||
onbasedoc.dateiTyp = db.dsdaten.Tables[0].Rows[0]["dateityp"].ToString();
|
onbasedoc.dateiTyp = db.dsdaten.Tables[0].Rows[0]["dateityp"].ToString();
|
||||||
|
|
||||||
|
|
||||||
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
|
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
|
||||||
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
|
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
|
||||||
@@ -811,6 +813,8 @@ namespace API_NetFramework.Controllers
|
|||||||
oba.Returnaddress = versandpaket.GASAdresse;
|
oba.Returnaddress = versandpaket.GASAdresse;
|
||||||
oba.O2ODochandle = "";
|
oba.O2ODochandle = "";
|
||||||
oba.Status = "";
|
oba.Status = "";
|
||||||
|
oba.ReferenceId = versandpaket.ReferenceID;
|
||||||
|
|
||||||
//if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
//if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
||||||
foreach (Versanddokument vd in versandpaket.Dokument)
|
foreach (Versanddokument vd in versandpaket.Dokument)
|
||||||
{
|
{
|
||||||
@@ -828,7 +832,7 @@ namespace API_NetFramework.Controllers
|
|||||||
oba.Returnaddress = versandpaket.GASAdresse;
|
oba.Returnaddress = versandpaket.GASAdresse;
|
||||||
oba.O2ODochandle = "";
|
oba.O2ODochandle = "";
|
||||||
oba.Status = "";
|
oba.Status = "";
|
||||||
|
oba.ReferenceId = versandpaket.ReferenceID;
|
||||||
|
|
||||||
foreach (Versanddokument vd in versandpaket.Dokument)
|
foreach (Versanddokument vd in versandpaket.Dokument)
|
||||||
{
|
{
|
||||||
@@ -908,6 +912,7 @@ namespace API_NetFramework.Controllers
|
|||||||
onbasedoc.dokumentDatum = DateTime.Now.ToString("dd.MM.yyyy");
|
onbasedoc.dokumentDatum = DateTime.Now.ToString("dd.MM.yyyy");
|
||||||
onbasedoc.dokumentDatei = versandpaket.finaldoc;
|
onbasedoc.dokumentDatei = versandpaket.finaldoc;
|
||||||
onbasedoc.dateiTyp = "PDF";
|
onbasedoc.dateiTyp = "PDF";
|
||||||
|
onbasedoc.ReferenceId = versandpaket.ReferenceID;
|
||||||
onbasedoc.attributes = new List<OnBaseDocUpload.attribute>();
|
onbasedoc.attributes = new List<OnBaseDocUpload.attribute>();
|
||||||
if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -120,19 +120,10 @@ ELSE
|
|||||||
FileName = $"{dto.Key}.pdf"
|
FileName = $"{dto.Key}.pdf"
|
||||||
};
|
};
|
||||||
response.Content.Headers.ContentLength = pdfBytes.Length;
|
response.Content.Headers.ContentLength = pdfBytes.Length;
|
||||||
if (System.IO.File.Exists(@"x:\file.pdf")) { System.IO.File.Delete(@"x:\file.pdf"); }
|
|
||||||
System.IO.FileStream stream =
|
|
||||||
|
|
||||||
new FileStream(@"x:\file.pdf", FileMode.CreateNew);
|
|
||||||
System.IO.BinaryWriter writer =
|
|
||||||
new BinaryWriter(stream);
|
|
||||||
writer.Write(pdfBytes, 0, pdfBytes.Length);
|
|
||||||
writer.Close();
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private async Task<byte[]> CallExternalPdfApi(string json)
|
private async Task<byte[]> CallExternalPdfApi(string json)
|
||||||
{
|
{
|
||||||
@@ -148,6 +139,7 @@ ELSE
|
|||||||
var data = Encoding.UTF8.GetBytes(jsonstring);
|
var data = Encoding.UTF8.GetBytes(jsonstring);
|
||||||
string OwnHost = System.Configuration.ConfigurationManager.AppSettings["OwnHost"].ToString();
|
string OwnHost = System.Configuration.ConfigurationManager.AppSettings["OwnHost"].ToString();
|
||||||
string uri = OwnHost + "/API/CreateCLM";
|
string uri = OwnHost + "/API/CreateCLM";
|
||||||
|
uri = OwnHost + "/API/DokumentGenerator";
|
||||||
request = WebRequest.Create(uri);
|
request = WebRequest.Create(uri);
|
||||||
request.ContentLength = data.Length;
|
request.ContentLength = data.Length;
|
||||||
request.ContentType = "application/json";
|
request.ContentType = "application/json";
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ namespace API_NetFramework.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[Route("API/GetUnterschriftAsBase64New")]
|
[Route("API/GetUnterschriftAsBase64IL")]
|
||||||
public IHttpActionResult GetUnterschriftAsBase64IL(string TGNummer, int ImageWidth = 0, int ImageHeight = 0)
|
public IHttpActionResult GetUnterschriftAsBase64IL(string TGNummer, int ImageWidth = 0, int ImageHeight = 0)
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -156,11 +156,13 @@ namespace API_NetFramework.Controllers
|
|||||||
apireturn.field = "";
|
apireturn.field = "";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
//return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||||
|
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
|
//return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
|
||||||
|
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||||
}
|
}
|
||||||
finally { apireturn = null; };
|
finally { apireturn = null; };
|
||||||
}
|
}
|
||||||
@@ -187,11 +189,13 @@ namespace API_NetFramework.Controllers
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
//return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||||
|
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return Content(HttpStatusCode.InternalServerError, "Unterschfit für TGNumemr " + TGNummer + " nicht vorhanden");
|
//return Content(HttpStatusCode.InternalServerError, "Unterschfit für TGNumemr " + TGNummer + " nicht vorhanden");
|
||||||
|
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -242,11 +246,12 @@ namespace API_NetFramework.Controllers
|
|||||||
apiok.file=Convert.ToBase64String(imageBytes);
|
apiok.file=Convert.ToBase64String(imageBytes);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return Ok(Newtonsoft.Json.JsonConvert.SerializeObject(apiok));
|
return Ok(apiok);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
return Content(HttpStatusCode.InternalServerError, e.Message);
|
//return Content(HttpStatusCode.InternalServerError, e.Message);
|
||||||
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,24 +4,24 @@
|
|||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>JSON Editor → PDF Preview</title>
|
<title>JSON Editor → PDF Preview</title>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<!-- ACE
|
<!-- ACE
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/ace.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/ace.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/mode-json.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/mode-json.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/theme-tomorrow.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/theme-tomorrow.min.js"></script>
|
||||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
|
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<script src="/Scripts/ace/ace.js"></script>
|
<script src="/Scripts/ace/ace.js"></script>
|
||||||
<script src="/Scripts/ace/mode-json.min.js"></script>
|
<script src="/Scripts/ace/mode-json.min.js"></script>
|
||||||
<script src="/Scripts/ace/theme-tomorrow.min.js"></script>
|
<script src="/Scripts/ace/theme-tomorrow.min.js"></script>
|
||||||
<script src="/Scripts/ace/worker-json.js"></script>
|
<script src="/Scripts/ace/worker-json.js"></script>
|
||||||
<script src="/Scripts/jquery.min.js"></script>
|
<script src="/Scripts/jquery.min.js"></script>
|
||||||
<script src="/Scripts/ace/ext-searchbox.js"></script>
|
<script src="/Scripts/ace/ext-searchbox.js"></script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -34,15 +34,15 @@
|
|||||||
border-bottom: 1px solid #ccc;
|
border-bottom: 1px solid #ccc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbar input {
|
.toolbar input {
|
||||||
width: 220px;
|
width: 220px;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbar button {
|
.toolbar button {
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
padding: 6px 10px;
|
padding: 6px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -75,91 +75,117 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<label>Schlüssel:</label>
|
<label>Schlüssel:</label>
|
||||||
<input type="text" id="key" placeholder="provDokumentID" />
|
<input type="text" id="key" placeholder="provDokumentID" />
|
||||||
<button onclick="loadJson()">Laden</button>
|
<button onclick="loadJson()">Laden</button>
|
||||||
<button onclick="saveJson()">Speichern</button>
|
<button onclick="saveJson()">Speichern</button>
|
||||||
<button onclick="generatePdf()">PDF generieren</button>
|
<button onclick="generatePdf()">PDF generieren</button>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<!-- LINKS: JSON -->
|
|
||||||
<div class="left">
|
|
||||||
<div id="editor">{}</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- RECHTS: PDF -->
|
<div class="container">
|
||||||
<div class="right">
|
<!-- LINKS: JSON -->
|
||||||
<iframe id="pdfFrame" title="PDF Vorschau"></iframe>
|
<div class="left">
|
||||||
|
<div id="editor">{}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- RECHTS: PDF -->
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<div class="right">
|
||||||
|
<iframe id="pdfFrame" title="PDF Vorschau"></iframe>
|
||||||
|
</div>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
const apiBase = "/api/json";
|
const apiBase = "/api/json";
|
||||||
|
|
||||||
|
|
||||||
// ACE INIT
|
// ACE INIT
|
||||||
const editor = ace.edit("editor");
|
const editor = ace.edit("editor");
|
||||||
editor.setTheme("ace/theme/tomorrow");
|
editor.setTheme("ace/theme/tomorrow");
|
||||||
editor.session.setMode("ace/mode/json");
|
editor.session.setMode("ace/mode/json");
|
||||||
editor.setShowPrintMargin(false);
|
editor.setShowPrintMargin(false);
|
||||||
editor.session.setTabSize(2);
|
editor.session.setTabSize(2);
|
||||||
editor.session.setUseSoftTabs(true);
|
editor.session.setUseSoftTabs(true);
|
||||||
|
const editor1 = ace.edit("editor");
|
||||||
|
editor1.setTheme("ace/theme/tomorrow");
|
||||||
|
editor1.session.setMode("ace/mode/json");
|
||||||
|
editor1.setShowPrintMargin(false);
|
||||||
|
editor1.session.setTabSize(2);
|
||||||
|
editor1.session.setUseSoftTabs(true);
|
||||||
|
|
||||||
// JSON LADEN
|
// JSON LADEN
|
||||||
function loadJson() {
|
function loadJson() {
|
||||||
const key = $("#key").val();
|
|
||||||
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
|
||||||
|
|
||||||
$.get(apiBase + "/load/" + encodeURIComponent(key))
|
editor.setValue("", -1);
|
||||||
.done(data => editor.setValue(data, -1))
|
clearPdfPreview();
|
||||||
.fail(() => alert("Kein Eintrag gefunden"));
|
const key = $("#key").val();
|
||||||
}
|
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
||||||
|
|
||||||
// JSON SPEICHERN
|
$.get(apiBase + "/load/" + encodeURIComponent(key))
|
||||||
function saveJson() {
|
.done(data => editor.setValue(data, -1))
|
||||||
const key = $("#key").val();
|
.fail(() => alert("Kein Eintrag gefunden"));
|
||||||
const json = editor.getValue();
|
}
|
||||||
|
|
||||||
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
// JSON SPEICHERN
|
||||||
|
function saveJson() {
|
||||||
|
const key = $("#key").val();
|
||||||
|
const json = editor.getValue();
|
||||||
|
|
||||||
try { JSON.parse(json); }
|
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
||||||
catch { alert("Ungültiges JSON"); return; }
|
|
||||||
|
|
||||||
$.ajax({
|
// try { JSON.parse(json); }
|
||||||
url: apiBase + "/save",
|
// catch { alert("Ungültiges JSON"); return; }
|
||||||
type: "POST",
|
|
||||||
contentType: "application/json",
|
|
||||||
data: JSON.stringify({ key: key, json: json }),
|
|
||||||
success: () => alert("Gespeichert")
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// PDF GENERIEREN & EMBEDDED ANZEIGEN
|
$.ajax({
|
||||||
function generatePdf() {
|
url: apiBase + "/save",
|
||||||
const key = $("#key").val();
|
type: "POST",
|
||||||
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
contentType: "application/json",
|
||||||
|
data: JSON.stringify({ key: key, json: json }),
|
||||||
|
success: () => alert("Gespeichert")
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
fetch(apiBase + "/generatepdf", {
|
// PDF GENERIEREN & EMBEDDED ANZEIGEN
|
||||||
method: "POST",
|
function generatePdf() {
|
||||||
headers: { "Content-Type": "application/json" },
|
const key = $("#key").val();
|
||||||
body: JSON.stringify({
|
if (!key) { alert("Bitte Schlüssel eingeben"); return; }
|
||||||
key: key,
|
|
||||||
json: editor.getValue()
|
fetch(apiBase + "/generatepdf", {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
key: key,
|
||||||
|
json: editor.getValue()
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
.then(r => {
|
||||||
.then(r => {
|
if (!r.ok) throw new Error("PDF-Fehler");
|
||||||
if (!r.ok) throw new Error("PDF-Fehler");
|
return r.blob();
|
||||||
return r.blob();
|
})
|
||||||
})
|
.then(blob => {
|
||||||
.then(blob => {
|
const url = URL.createObjectURL(blob);
|
||||||
const url = URL.createObjectURL(blob);
|
document.getElementById("pdfFrame").src = url;
|
||||||
document.getElementById("pdfFrame").src = url;
|
})
|
||||||
})
|
.catch(err => alert(err.message));
|
||||||
.catch(err => alert(err.message));
|
}
|
||||||
}
|
function clearPdfPreview() {
|
||||||
</script>
|
const frame = document.getElementById("pdfFrame");
|
||||||
|
|
||||||
|
// iframe leeren
|
||||||
|
frame.src = "";
|
||||||
|
|
||||||
|
// optional: alte Blob-URL freigeben
|
||||||
|
if (frame.dataset.blobUrl) {
|
||||||
|
URL.revokeObjectURL(frame.dataset.blobUrl);
|
||||||
|
frame.dataset.blobUrl = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15982
API_NetFramework/log.txt
15982
API_NetFramework/log.txt
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2
Client/Diverses/SplashScreen.Designer.cs
generated
2
Client/Diverses/SplashScreen.Designer.cs
generated
@@ -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 = "9. Januar 2026";
|
this.label2.Text = "3. Febraur 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);
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||||
// indem Sie "*" wie unten gezeigt eingeben:
|
// indem Sie "*" wie unten gezeigt eingeben:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.7.11.05")]
|
[assembly: AssemblyVersion("1.8.0.01")]
|
||||||
[assembly: AssemblyFileVersion("1.7.11.05")]
|
[assembly: AssemblyFileVersion("1.8.0.01")]
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ namespace OnDoc.UIControls
|
|||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
db.Get_Tabledata("Select * from ondoc_view_prov_pakete where (aktiv=1 and (signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "'))", false, true);
|
db.Get_Tabledata("Select * from ondoc_view_prov_pakete where (aktiv=1 and signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (aktiv= 1 and signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "')", false, true);
|
||||||
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
|
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
|
||||||
{
|
{
|
||||||
if (tmppartner != Convert.ToInt32(dr["partnernr"]))
|
if (tmppartner != Convert.ToInt32(dr["partnernr"]))
|
||||||
@@ -235,13 +235,36 @@ namespace OnDoc.UIControls
|
|||||||
pnlsignerror.Visible = false;
|
pnlsignerror.Visible = false;
|
||||||
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(), "Ablehnen");
|
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(), "Ablehnen");
|
||||||
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
|
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
|
||||||
|
clsMailer mailer = new clsMailer();
|
||||||
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)"))
|
||||||
|
{
|
||||||
|
string pid = treeViewAdv1.SelectedNode.Tag.ToString();
|
||||||
|
pid = pid.Substring(0, pid.Length - 7);
|
||||||
|
DB db1 = new DB(AppParams.connectionstring);
|
||||||
|
db1.clear_parameter();
|
||||||
|
db1.add_parameter("@paketid", pid);
|
||||||
|
db1.add_parameter("@unterzeichner", AppParams.currenttgnummer.ToString());
|
||||||
|
db1.add_parameter("@genehmigt", "0");
|
||||||
|
|
||||||
|
db1.Get_Tabledata("sp_ondoc_prov_versandpaket_genehmigt", true, false);
|
||||||
|
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) > 0)
|
||||||
|
{
|
||||||
|
clsMailer mailer1 = new clsMailer();
|
||||||
|
mailer1.sendmail(10, db1.dsdaten.Tables[0].Rows[0][0].ToString(), "", "", pid.ToString(), "", AppParams.CurrentMitarbeiter.ToString(), "");
|
||||||
|
mailer1 = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_node();
|
||||||
|
db1 = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "', betreff='" + note.betreff + "', notizgrund='" + note.notiz + "' where id=" + dr["id"].ToString();
|
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "', betreff='" + note.betreff + "', notizgrund='" + note.notiz + "' where id=" + dr["id"].ToString();
|
||||||
db.Exec_SQL(sql);
|
db.Exec_SQL(sql);
|
||||||
clsMailer mailer = new clsMailer();
|
|
||||||
string empfaengerid = "";
|
string empfaengerid = "";
|
||||||
db.Get_Tabledata("Select mutierer from dokument_Bewilligung where id=" + dr["id"].ToString(), false, true);
|
db.Get_Tabledata("Select mutierer from dokument_Bewilligung where id=" + dr["id"].ToString(), false, true);
|
||||||
empfaengerid = db.dsdaten.Tables[0].Rows[0][0].ToString();
|
empfaengerid = db.dsdaten.Tables[0].Rows[0][0].ToString();
|
||||||
@@ -434,6 +457,13 @@ namespace OnDoc.UIControls
|
|||||||
db1.add_parameter("@genehmigt", "1");
|
db1.add_parameter("@genehmigt", "1");
|
||||||
|
|
||||||
db1.Get_Tabledata("sp_ondoc_prov_versandpaket_genehmigt", true, false);
|
db1.Get_Tabledata("sp_ondoc_prov_versandpaket_genehmigt", true, false);
|
||||||
|
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) > 0)
|
||||||
|
{
|
||||||
|
clsMailer mailer1 = new clsMailer();
|
||||||
|
mailer1.sendmail(11, db1.dsdaten.Tables[0].Rows[0][0].ToString(), "", "", pid.ToString(), "", AppParams.CurrentMitarbeiter.ToString(),"");
|
||||||
|
mailer1 = null;
|
||||||
|
}
|
||||||
|
|
||||||
remove_node();
|
remove_node();
|
||||||
db1 = null;
|
db1 = null;
|
||||||
return;
|
return;
|
||||||
@@ -450,10 +480,10 @@ namespace OnDoc.UIControls
|
|||||||
treeViewAdv1.SelectedNode.Height = 0;
|
treeViewAdv1.SelectedNode.Height = 0;
|
||||||
signthread.Start();
|
signthread.Start();
|
||||||
|
|
||||||
|
|
||||||
//remove_node();
|
//remove_node();
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2134,7 +2134,7 @@ namespace OnDoc.UICintrols
|
|||||||
approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
|
approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
db1.Get_Tabledata("Select count(*) from ondoc_view_prov_pakete where (aktiv=1 and (signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "'))", false, true);
|
db1.Get_Tabledata("Select count(*) from ondoc_view_prov_pakete where (aktiv=1 and signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (aktiv=1 and signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "')", false, true);
|
||||||
approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
|
approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
|
|||||||
@@ -1437,8 +1437,14 @@ namespace OnDoc.Versandstrasse
|
|||||||
DB db = new DB(AppParams.connectionstring);
|
DB db = new DB(AppParams.connectionstring);
|
||||||
DB db2 = new DB(AppParams.connectionstring);
|
DB db2 = new DB(AppParams.connectionstring);
|
||||||
//STH
|
//STH
|
||||||
//db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where isnull(signed,1)=1 and aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
|
try
|
||||||
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
|
{
|
||||||
|
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where isnull(signed,1)=1 and aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
|
||||||
|
}
|
||||||
treeViewAdvCouverts.Nodes.Clear();
|
treeViewAdvCouverts.Nodes.Clear();
|
||||||
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
|
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
|
||||||
{
|
{
|
||||||
|
|||||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -45,6 +45,7 @@ using Syncfusion.Windows.Forms.Chart;
|
|||||||
using Microsoft.SqlServer.Server;
|
using Microsoft.SqlServer.Server;
|
||||||
using Syncfusion.Windows.Forms.Chart.SvgBase;
|
using Syncfusion.Windows.Forms.Chart.SvgBase;
|
||||||
using System.Drawing.Imaging;
|
using System.Drawing.Imaging;
|
||||||
|
using BarcodeLib;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -221,6 +222,7 @@ namespace DOCGEN.Klassen
|
|||||||
case "14":
|
case "14":
|
||||||
case "15":
|
case "15":
|
||||||
case "16":
|
case "16":
|
||||||
|
case "18":
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ReplaceBookmarkContent(ref document, item.itemname, "", item.itemvalue, false);
|
ReplaceBookmarkContent(ref document, item.itemname, "", item.itemvalue, false);
|
||||||
@@ -264,15 +266,13 @@ namespace DOCGEN.Klassen
|
|||||||
Insert_CLMImages(item, ref document, true);
|
Insert_CLMImages(item, ref document, true);
|
||||||
break;
|
break;
|
||||||
case "11":
|
case "11":
|
||||||
insert_Logo(document, null);
|
Insert_CLMLogo(item,ref document);
|
||||||
break;
|
break;
|
||||||
case "12":
|
case "12":
|
||||||
Insert_CLMTable(item, ref document);
|
Insert_CLMTable(item, ref document);
|
||||||
break;
|
break;
|
||||||
case "17": //Datamatrix
|
case "17": //Datamatrix
|
||||||
|
Insert_CLMDataMatrix(item,ref document);
|
||||||
break;
|
|
||||||
case "18": //Pruefziffer
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -284,7 +284,125 @@ namespace DOCGEN.Klassen
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
private void Insert_CLMLogo(CLMDocItem item, ref WordDocument document)
|
||||||
|
{
|
||||||
|
// IWSection section = document.Sections[0];
|
||||||
|
// IWParagraph paragraph = section.HeadersFooters.Header.AddParagraph();
|
||||||
|
|
||||||
|
string b64 = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(get_image(4, -1, 0));
|
||||||
|
|
||||||
|
byte[] imageBytes = Convert.FromBase64String(b64);
|
||||||
|
using (var ms = new MemoryStream(imageBytes, 0, imageBytes.Length))
|
||||||
|
{
|
||||||
|
System.Drawing.Image image = System.Drawing.Image.FromStream(ms);
|
||||||
|
//paragraph.AppendPicture(image);
|
||||||
|
|
||||||
|
WPicture picture = new WPicture(document);
|
||||||
|
WPicture picture2 = new WPicture(document);
|
||||||
|
picture.LoadImage(image);
|
||||||
|
picture2.LoadImage(image);
|
||||||
|
|
||||||
|
picture.VerticalPosition = Convert.ToInt32(item.left);
|
||||||
|
picture.HorizontalPosition = Convert.ToInt32(item.top);
|
||||||
|
picture.HorizontalOrigin = HorizontalOrigin.Page;
|
||||||
|
picture.VerticalOrigin = VerticalOrigin.Page;
|
||||||
|
picture.TextWrappingStyle = TextWrappingStyle.Square;
|
||||||
|
picture.TextWrappingType = TextWrappingType.Largest;
|
||||||
|
picture2.VerticalPosition = picture.VerticalPosition;
|
||||||
|
picture2.HorizontalPosition = picture.HorizontalPosition;
|
||||||
|
picture2.HorizontalOrigin = HorizontalOrigin.Page;
|
||||||
|
picture2.VerticalOrigin = VerticalOrigin.Page;
|
||||||
|
picture2.TextWrappingStyle = TextWrappingStyle.Square;
|
||||||
|
picture2.TextWrappingType = TextWrappingType.Largest;
|
||||||
|
|
||||||
|
picture.Rotation = 0;
|
||||||
|
picture.Height = Convert.ToInt32(item.height);
|
||||||
|
picture.Width = Convert.ToInt32(item.width);
|
||||||
|
picture.VerticalPosition = Convert.ToInt32(item.top);
|
||||||
|
picture.HorizontalPosition = Convert.ToInt32(item.left);
|
||||||
|
picture2.Rotation = 0;
|
||||||
|
picture2.Height = picture.Height;
|
||||||
|
picture2.Width = picture.Width;
|
||||||
|
picture2.VerticalPosition = picture.VerticalPosition;
|
||||||
|
picture2.HorizontalPosition = picture.HorizontalPosition;
|
||||||
|
|
||||||
|
//foreach (IWSection section in document.Sections)
|
||||||
|
//{
|
||||||
|
IWSection section = document.Sections[0];
|
||||||
|
if (section.PageSetup.DifferentFirstPage == true)
|
||||||
|
{
|
||||||
|
|
||||||
|
WParagraph FirstfooterPar = new WParagraph(document);
|
||||||
|
FirstfooterPar.ChildEntities.Add(picture);
|
||||||
|
if (section.HeadersFooters.FirstPageHeader.Paragraphs.Count > 0)
|
||||||
|
{
|
||||||
|
section.HeadersFooters.FirstPageHeader.Paragraphs.RemoveAt(section.HeadersFooters.FirstPageHeader.Paragraphs.Count - 1);
|
||||||
|
}
|
||||||
|
section.HeadersFooters.FirstPageHeader.Paragraphs.Add(FirstfooterPar);
|
||||||
|
}
|
||||||
|
WParagraph footerPar = new WParagraph(document);
|
||||||
|
footerPar.ChildEntities.Add(picture2);
|
||||||
|
if (section.HeadersFooters.Header.Count > 0) { section.HeadersFooters.Header.Paragraphs.RemoveAt(section.HeadersFooters.Header.Paragraphs.Count - 1); }
|
||||||
|
section.HeadersFooters.Header.Paragraphs.Add(footerPar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private void Insert_CLMDataMatrix(CLMDocItem item, ref WordDocument document)
|
||||||
|
{
|
||||||
|
BarcodeLib.Barcode Barcode = new BarcodeLib.Barcode();
|
||||||
|
System.Drawing.Image barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, item.itemvalue.ToString(), 6, 6, 0, "Right", item.itemvalue.ToString().Substring(5,16),"", 12);
|
||||||
|
System.Drawing.Image barcodeimage2;
|
||||||
|
barcodeimage2 = barcodeimage;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
WPicture picture = new WPicture(document);
|
||||||
|
WPicture picture2 = new WPicture(document);
|
||||||
|
picture.LoadImage(barcodeimage);
|
||||||
|
picture2.LoadImage(barcodeimage);
|
||||||
|
|
||||||
|
picture.VerticalPosition = Convert.ToInt32(item.left);
|
||||||
|
picture.HorizontalPosition = Convert.ToInt32(item.top);
|
||||||
|
picture.HorizontalOrigin = HorizontalOrigin.Page;
|
||||||
|
picture.VerticalOrigin = VerticalOrigin.Page;
|
||||||
|
picture.TextWrappingStyle = TextWrappingStyle.Square;
|
||||||
|
picture.TextWrappingType = TextWrappingType.Largest;
|
||||||
|
picture2.VerticalPosition = picture.VerticalPosition;
|
||||||
|
picture2.HorizontalPosition = picture.HorizontalPosition;
|
||||||
|
picture2.HorizontalOrigin = HorizontalOrigin.Page;
|
||||||
|
picture2.VerticalOrigin = VerticalOrigin.Page;
|
||||||
|
picture2.TextWrappingStyle = TextWrappingStyle.Square;
|
||||||
|
picture2.TextWrappingType = TextWrappingType.Largest;
|
||||||
|
|
||||||
|
picture.Rotation = 0;
|
||||||
|
picture.Height = Convert.ToInt32(item.height);
|
||||||
|
picture.Width = Convert.ToInt32(item.width);
|
||||||
|
picture.VerticalPosition = Convert.ToInt32(item.top);
|
||||||
|
picture.HorizontalPosition = Convert.ToInt32(item.left);
|
||||||
|
picture2.Rotation = 0;
|
||||||
|
picture2.Height = picture.Height;
|
||||||
|
picture2.Width = picture.Width;
|
||||||
|
picture2.VerticalPosition = picture.VerticalPosition;
|
||||||
|
picture2.HorizontalPosition = picture.HorizontalPosition;
|
||||||
|
|
||||||
|
//foreach (IWSection section in document.Sections)
|
||||||
|
//{
|
||||||
|
IWSection section = document.Sections[0];
|
||||||
|
if (section.PageSetup.DifferentFirstPage == true)
|
||||||
|
{
|
||||||
|
|
||||||
|
WParagraph FirstfooterPar = new WParagraph(document);
|
||||||
|
FirstfooterPar.ChildEntities.Add(picture);
|
||||||
|
if (section.HeadersFooters.FirstPageFooter.Paragraphs.Count > 0)
|
||||||
|
{
|
||||||
|
section.HeadersFooters.FirstPageFooter.Paragraphs.RemoveAt(section.HeadersFooters.FirstPageFooter.Paragraphs.Count - 1);
|
||||||
|
}
|
||||||
|
section.HeadersFooters.FirstPageFooter.Paragraphs.Add(FirstfooterPar);
|
||||||
|
}
|
||||||
|
WParagraph footerPar = new WParagraph(document);
|
||||||
|
footerPar.ChildEntities.Add(picture2);
|
||||||
|
if (section.HeadersFooters.Footer.Count > 0) { section.HeadersFooters.Footer.Paragraphs.RemoveAt(section.HeadersFooters.Footer.Paragraphs.Count - 1); }
|
||||||
|
section.HeadersFooters.Footer.Paragraphs.Add(footerPar);
|
||||||
|
}
|
||||||
private void Insert_CLMField(CLMDocItem item, ref WordDocument document)
|
private void Insert_CLMField(CLMDocItem item, ref WordDocument document)
|
||||||
{
|
{
|
||||||
foreach (WSection section in document.Sections)
|
foreach (WSection section in document.Sections)
|
||||||
|
|||||||
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.
Binary file not shown.
@@ -17,6 +17,7 @@ namespace Model
|
|||||||
public string bpNummer { get; set; }
|
public string bpNummer { get; set; }
|
||||||
public string personNummer { get; set; }
|
public string personNummer { get; set; }
|
||||||
public string dokumentDatei { get; set; }
|
public string dokumentDatei { get; set; }
|
||||||
|
public string ReferenceId { get; set; }
|
||||||
public List<attribute> attributes { get; set; }
|
public List<attribute> attributes { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ namespace Model
|
|||||||
public List<attribute> APIValues { get; set; }
|
public List<attribute> APIValues { get; set; }
|
||||||
public List<textreplace> TextToReplace { get; set; }
|
public List<textreplace> TextToReplace { get; set; }
|
||||||
public List<Listen> Listen { get; set; }
|
public List<Listen> Listen { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
public class Liste
|
public class Liste
|
||||||
{
|
{
|
||||||
@@ -136,6 +138,7 @@ namespace Model
|
|||||||
public string height;
|
public string height;
|
||||||
public string tablevalues;
|
public string tablevalues;
|
||||||
public string format;
|
public string format;
|
||||||
|
public bool done = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
//public class CLMDocItems
|
//public class CLMDocItems
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Model
|
|||||||
public int protokollid { get; set; } = 0;
|
public int protokollid { get; set; } = 0;
|
||||||
|
|
||||||
public string bemerkung { get; set; } = "";
|
public string bemerkung { get; set; } = "";
|
||||||
|
public string ReferenceID { get; set; } = "";
|
||||||
public List<Versanddokument> Dokument { get; set; }
|
public List<Versanddokument> Dokument { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -51,10 +52,6 @@ namespace Model
|
|||||||
Partnernr = partnernr;
|
Partnernr = partnernr;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class OnBase_Attributes
|
public class OnBase_Attributes
|
||||||
@@ -68,6 +65,7 @@ namespace Model
|
|||||||
public string Returnaddress { get; set; } = "";
|
public string Returnaddress { get; set; } = "";
|
||||||
public string O2ODochandle { get; set; } = "";
|
public string O2ODochandle { get; set; } = "";
|
||||||
public string Status { get; set; } = "";
|
public string Status { get; set; } = "";
|
||||||
|
public string ReferenceId { get; set; } = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
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.
Reference in New Issue
Block a user