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

update 20250205

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-05 19:38:22 +01:00
parent 00eae8a837
commit 678e0622fd
311 changed files with 60684 additions and 2287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
API_NetFramework/Controllers/ArchivController.cs
View File

@@ -46,7 +46,7 @@ namespace API_NetFramework.Controllers
slow = 2,
docupload = 3
}
public class ArchivController : ApiController
{
// GET: OnBase
@@ -61,7 +61,7 @@ namespace API_NetFramework.Controllers
string sql = "Insert OnDoc_IL_Log (dokumentid, ilresponse,error, erstellt_am) values ('" + dokumentid + "',";
sql = sql + "'" + ilr.response.ToString() + "',";
if (ilr.senderror != 0) { sql = sql + "1,"; } else { sql = sql + "0,"; }
sql = sql +"getdate() )";
sql = sql + "getdate() )";
dB.Exec_SQL(sql);
dB = null;
APILogging.Log((HttpRequestMessage)Request, "Ende Update IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug);
@@ -144,7 +144,7 @@ namespace API_NetFramework.Controllers
APILogging.Log((HttpRequestMessage)Request, "Start ArchiveDocFromDatabase: DokumentID:" + DokumentID, LogLevelType.Debug);
DB db = new DB(connectionstring);
db.Get_Tabledata("Select dokumenttypnr, dokumentname from dokument where dokumentid='" + DokumentID+"'", false, true);
db.Get_Tabledata("Select dokumenttypnr, dokumentname from dokument where dokumentid='" + DokumentID + "'", false, true);
extension = System.IO.Path.GetExtension(db.dsdaten.Tables[0].Rows[0]["dokumentname"].ToString());
doktypnr = db.dsdaten.Tables[0].Rows[0][0].ToString();
db.clear_parameter();
@@ -154,7 +154,7 @@ namespace API_NetFramework.Controllers
DocGet dg = new DocGet(connectionstring);
clsdok dok = new clsdok("", "", "");
string[] officeformat = System.Configuration.ConfigurationManager.AppSettings["ArchivierungOfficeFormat"].ToString().Split(',');
string[] excelconvert = System.Configuration.ConfigurationManager.AppSettings["ExcelDokType"].ToString().Split(',');
string excelvaluefile = System.Configuration.ConfigurationManager.AppSettings["ExcelValueFile"].ToString();
@@ -202,12 +202,13 @@ namespace API_NetFramework.Controllers
db.Get_Tabledata("[sp_Get_OnDoc_Parameters]", true, false);
}
if (officeformat.Contains(doktypnr) || extension.ToUpper()=="PDF")
if (officeformat.Contains(doktypnr) || extension.ToUpper() == "PDF")
{
dg.GetDoc(DokumentID);
extension = extension.ToUpper().Replace(".", "");
}
else {
else
{
dok = dg.GetDocAsPDF(DokumentID);
extension = "PDF";
}
@@ -260,7 +261,7 @@ namespace API_NetFramework.Controllers
APILogging.Log((HttpRequestMessage)Request, "Ende ArchiveDocFromDatabase: DokumentID:" + DokumentID, LogLevelType.Debug);
//Log nachführen
Update_IL_Log(ref ilr,DokumentID);
Update_IL_Log(ref ilr, DokumentID);
if (ilr.senderror == 1)
{
return Content(HttpStatusCode.InternalServerError, ilr.response);
@@ -282,7 +283,7 @@ namespace API_NetFramework.Controllers
}
[HttpPost]
[Route("API/ArchivDocFromIRIS")]
@@ -306,18 +307,34 @@ namespace API_NetFramework.Controllers
db.clear_parameter();
db.add_parameter("@dokumentid", dokumentid);
db.Get_Tabledata("[OnDoc_IRIS_Archivierung]", true, false);
string returnmessage = db.dsdaten.Tables[0].Rows[0][0].ToString();
switch (db.dsdaten.Tables[0].Rows[0][1].ToString())
{
case "1":
case "2":
case "3":
APILogging.Log((HttpRequestMessage)Request, db.dsdaten.Tables[0].Rows[0].ToString() + dokumentid, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, returnmessage);
case "0":
return (ArchivDocFromDatabase(dokumentid));
default:
break;
string returnmessage = db.dsdaten.Tables[0].Rows[0][0].ToString();
switch (db.dsdaten.Tables[0].Rows[0][1].ToString())
{
case "1":
APILogging.Log((HttpRequestMessage)Request, dokumentid + " Image des Dokuments nicht vorhanden", LogLevelType.Error);
return Content(HttpStatusCode.NotFound, dokumentid);
break;
case "2":
APILogging.Log((HttpRequestMessage)Request, dokumentid + " nicht vorhanden", LogLevelType.Error);
return Content(HttpStatusCode.NotFound, dokumentid);
break;
case "3":
APILogging.Log((HttpRequestMessage)Request, db.dsdaten.Tables[0].Rows[0][0].ToString() + dokumentid, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, returnmessage);
case "0":
return (ArchivDocFromDatabase(dokumentid));
case "4":
APILogging.Log((HttpRequestMessage)Request, "Dokumentarchivierung von Iris ausgelöst" + dokumentid, LogLevelType.Info);
break;
case "5":
APILogging.Log((HttpRequestMessage)Request, "Dokument bereit zur Ausgangsarchivierung" + dokumentid, LogLevelType.Info);
break;
case "6":
APILogging.Log((HttpRequestMessage)Request, "Dokument in EDOKA abgeschlossen" + dokumentid, LogLevelType.Info);
break;
default:
break;
};
}
@@ -334,8 +351,8 @@ namespace API_NetFramework.Controllers
}
[HttpPost]
[Route("API/ArchivSBDoc")]
public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr, string dokumentid )
public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr, string dokumentid)
{
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
@@ -362,15 +379,15 @@ namespace API_NetFramework.Controllers
IHttpActionResult transferResult = null;
if (SendToOnBase != "Yes")
{
transferResult = Transfer_OnBase(uploadtype.slow, ref jsonstring, ref ilr);
transferResult = Transfer_OnBase(uploadtype.slow, ref jsonstring, ref ilr);
if (SendToFile == "Yes")
{
if (debugfilename != "")
{
debugfilename=debugfilename+ sbnr.ToString() + "_" + intid.ToString() + "_" + partnernr.ToString() + ".json";
debugfilename = debugfilename + sbnr.ToString() + "_" + intid.ToString() + "_" + partnernr.ToString() + ".json";
System.IO.File.WriteAllText(debugfilename, jsonstring);
}
}
}
@@ -388,10 +405,11 @@ namespace API_NetFramework.Controllers
WebRequest request;
APILogging.Log((HttpRequestMessage)Request, "Start Transfer to OnBase", LogLevelType.Debug);
string url ="";
switch (utype){
string url = "";
switch (utype)
{
case uploadtype.fast:
url= System.Configuration.ConfigurationManager.AppSettings["ILFast"];
url = System.Configuration.ConfigurationManager.AppSettings["ILFast"];
break;
case uploadtype.slow:
url = System.Configuration.ConfigurationManager.AppSettings["ILSlow"];
@@ -423,7 +441,7 @@ namespace API_NetFramework.Controllers
}
ilr.StatusCode = 0;
ilr.senderror = 0;
ilr.response=response;
ilr.response = response;
APILogging.Log((HttpRequestMessage)Request, "Ende Transfer to OnBase", LogLevelType.Debug);
return Content(HttpStatusCode.OK, ilr);
}

212
API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@@ -5,12 +5,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc</_PublishTargetUrl>
<History>True|2025-02-04T21:19:44.0470841Z||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<History>True|2025-02-05T13:41:27.6196364Z||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
<publishTime>06/03/2024 09:20:46</publishTime>
<publishTime>03/06/2024 09:20:46</publishTime>
</File>
<File Include="Areas/HelpPage/Views/Help/Api.cshtml">
<publishTime>07/19/2024 12:24:15</publishTime>
@@ -49,7 +49,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>07/19/2024 12:24:15</publishTime>
</File>
<File Include="Areas/HelpPage/Views/Help/DisplayTemplates/Samples.cshtml">
<publishTime>06/03/2024 09:20:41</publishTime>
<publishTime>03/06/2024 09:20:41</publishTime>
</File>
<File Include="Areas/HelpPage/Views/Help/DisplayTemplates/SimpleTypeModelDescription.cshtml">
<publishTime>07/19/2024 12:24:15</publishTime>
@@ -64,28 +64,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>07/19/2024 12:24:15</publishTime>
</File>
<File Include="Areas/HelpPage/Views/Shared/_Layout.cshtml">
<publishTime>06/03/2024 09:20:40</publishTime>
<publishTime>03/06/2024 09:20:40</publishTime>
</File>
<File Include="Areas/HelpPage/Views/Web.config">
<publishTime>06/03/2024 09:20:40</publishTime>
<publishTime>03/06/2024 09:20:40</publishTime>
</File>
<File Include="Areas/HelpPage/Views/_ViewStart.cshtml">
<publishTime>06/03/2024 09:20:40</publishTime>
<publishTime>03/06/2024 09:20:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>09/10/2013 17:29:20</publishTime>
<publishTime>10/09/2013 17:29:20</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
<publishTime>09/10/2013 17:29:20</publishTime>
<publishTime>10/09/2013 17:29:20</publishTime>
</File>
<File Include="bin/arm64/libSkiaSharp.dll">
<publishTime>04/09/2024 19:25:14</publishTime>
<publishTime>09/04/2024 19:25:14</publishTime>
</File>
<File Include="bin/BarcodeLib.dll">
<publishTime>02/03/2025 13:48:41</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/BarcodeLib.pdb">
<publishTime>02/03/2025 13:48:41</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/CSVNET.dll">
<publishTime>12/26/2024 14:12:09</publishTime>
@@ -94,10 +94,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>12/26/2024 14:12:09</publishTime>
</File>
<File Include="bin/Database.dll">
<publishTime>02/03/2025 12:55:09</publishTime>
<publishTime>02/05/2025 10:19:09</publishTime>
</File>
<File Include="bin/Database.pdb">
<publishTime>02/03/2025 12:55:09</publishTime>
<publishTime>02/05/2025 10:19:09</publishTime>
</File>
<File Include="bin/de/System.Net.Http.Formatting.resources.dll">
<publishTime>10/20/2023 22:35:02</publishTime>
@@ -115,7 +115,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/20/2023 22:35:02</publishTime>
</File>
<File Include="bin/de/System.Web.Optimization.resources.dll">
<publishTime>02/11/2014 16:28:40</publishTime>
<publishTime>11/02/2014 16:28:40</publishTime>
</File>
<File Include="bin/de/System.Web.Razor.resources.dll">
<publishTime>10/20/2023 22:35:02</publishTime>
@@ -130,22 +130,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/20/2023 22:35:04</publishTime>
</File>
<File Include="bin/DOCGEN.dll">
<publishTime>02/04/2025 20:25:45</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/DOCGEN.dll.config">
<publishTime>12/23/2024 22:17:43</publishTime>
</File>
<File Include="bin/DOCGEN.pdb">
<publishTime>02/04/2025 20:25:45</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/FastReport.Bars.dll">
<publishTime>11/27/2023 09:49:58</publishTime>
</File>
<File Include="bin/FastReport.Compat.dll">
<publishTime>09/07/2023 11:54:46</publishTime>
<publishTime>07/09/2023 11:54:46</publishTime>
</File>
<File Include="bin/FastReport.DataVisualization.dll">
<publishTime>09/07/2023 12:19:34</publishTime>
<publishTime>07/09/2023 12:19:34</publishTime>
</File>
<File Include="bin/FastReport.dll">
<publishTime>11/27/2023 09:50:34</publishTime>
@@ -160,7 +160,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>12/30/2024 08:48:57</publishTime>
</File>
<File Include="bin/libSkiaSharp.dylib">
<publishTime>04/09/2024 18:58:02</publishTime>
<publishTime>09/04/2024 18:58:02</publishTime>
</File>
<File Include="bin/Logging.dll">
<publishTime>12/30/2024 08:48:57</publishTime>
@@ -169,22 +169,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>12/30/2024 08:48:57</publishTime>
</File>
<File Include="bin/Microsoft.AspNetCore.Http.Abstractions.dll">
<publishTime>11/12/2018 18:29:00</publishTime>
<publishTime>12/11/2018 18:29:00</publishTime>
</File>
<File Include="bin/Microsoft.AspNetCore.Http.dll">
<publishTime>01/25/2019 00:18:54</publishTime>
</File>
<File Include="bin/Microsoft.AspNetCore.Http.Features.dll">
<publishTime>11/12/2018 18:28:58</publishTime>
<publishTime>12/11/2018 18:28:58</publishTime>
</File>
<File Include="bin/Microsoft.AspNetCore.WebUtilities.dll">
<publishTime>11/12/2018 18:29:00</publishTime>
<publishTime>12/11/2018 18:29:00</publishTime>
</File>
<File Include="bin/Microsoft.Bcl.AsyncInterfaces.dll">
<publishTime>10/31/2023 16:00:18</publishTime>
</File>
<File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
<publishTime>03/05/2023 23:41:40</publishTime>
<publishTime>05/03/2023 23:41:40</publishTime>
</File>
<File Include="bin/Microsoft.Extensions.Configuration.Abstractions.dll">
<publishTime>10/31/2023 16:04:06</publishTime>
@@ -208,10 +208,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/31/2023 16:00:32</publishTime>
</File>
<File Include="bin/Microsoft.Net.Http.Headers.dll">
<publishTime>11/12/2018 18:28:58</publishTime>
<publishTime>12/11/2018 18:28:58</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
<publishTime>04/11/2022 19:09:46</publishTime>
<publishTime>11/04/2022 19:09:46</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>02/02/2025 15:33:38</publishTime>
@@ -229,7 +229,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>11/28/2018 00:07:54</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 06:09:56</publishTime>
<publishTime>08/03/2023 06:09:56</publishTime>
</File>
<File Include="bin/NLog.Database.dll">
<publishTime>04/30/2024 21:58:56</publishTime>
@@ -244,16 +244,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/28/2025 08:37:54</publishTime>
</File>
<File Include="bin/OnDocOffice.dll">
<publishTime>02/04/2025 20:25:45</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/OnDocOffice.pdb">
<publishTime>02/04/2025 20:25:45</publishTime>
<publishTime>02/05/2025 10:44:23</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.dll">
<publishTime>02/04/2025 22:13:57</publishTime>
<publishTime>02/05/2025 14:32:03</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.pdb">
<publishTime>02/04/2025 22:13:57</publishTime>
<publishTime>02/05/2025 14:32:03</publishTime>
</File>
<File Include="bin/Owin.dll">
<publishTime>11/13/2012 13:19:34</publishTime>
@@ -301,10 +301,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/15/2022 06:21:10</publishTime>
</File>
<File Include="bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll">
<publishTime>10/05/2021 02:47:54</publishTime>
<publishTime>05/10/2021 02:47:54</publishTime>
</File>
<File Include="bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll">
<publishTime>10/05/2021 02:49:46</publishTime>
<publishTime>05/10/2021 02:49:46</publishTime>
</File>
<File Include="bin/roslyn/Microsoft.Managed.Core.CurrentVersions.targets">
<publishTime>02/15/2022 06:33:08</publishTime>
@@ -355,34 +355,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/15/2022 06:38:42</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>07/08/2017 03:30:56</publishTime>
<publishTime>08/07/2017 03:30:56</publishTime>
</File>
<File Include="bin/Syncfusion.Compression.Base.dll">
<publishTime>09/12/2024 21:02:32</publishTime>
<publishTime>12/09/2024 21:02:32</publishTime>
</File>
<File Include="bin/Syncfusion.DocIO.Base.dll">
<publishTime>09/12/2024 21:21:22</publishTime>
<publishTime>12/09/2024 21:21:22</publishTime>
</File>
<File Include="bin/Syncfusion.DocToPDFConverter.Base.dll">
<publishTime>09/12/2024 21:25:18</publishTime>
<publishTime>12/09/2024 21:25:18</publishTime>
</File>
<File Include="bin/Syncfusion.ExcelToPDFConverter.Base.dll">
<publishTime>09/12/2024 21:34:20</publishTime>
<publishTime>12/09/2024 21:34:20</publishTime>
</File>
<File Include="bin/Syncfusion.Licensing.dll">
<publishTime>09/12/2024 21:33:50</publishTime>
<publishTime>12/09/2024 21:33:50</publishTime>
</File>
<File Include="bin/Syncfusion.OfficeChart.Base.dll">
<publishTime>09/12/2024 21:03:58</publishTime>
<publishTime>12/09/2024 21:03:58</publishTime>
</File>
<File Include="bin/Syncfusion.Pdf.Base.dll">
<publishTime>09/12/2024 21:23:26</publishTime>
<publishTime>12/09/2024 21:23:26</publishTime>
</File>
<File Include="bin/Syncfusion.Presentation.Base.dll">
<publishTime>09/12/2024 21:32:30</publishTime>
<publishTime>12/09/2024 21:32:30</publishTime>
</File>
<File Include="bin/Syncfusion.XlsIO.Base.dll">
<publishTime>09/12/2024 21:26:42</publishTime>
<publishTime>12/09/2024 21:26:42</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>02/19/2020 11:05:18</publishTime>
@@ -391,7 +391,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>05/15/2018 15:29:36</publishTime>
</File>
<File Include="bin/System.Memory.dll">
<publishTime>05/08/2022 05:31:02</publishTime>
<publishTime>08/05/2022 05:31:02</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>10/20/2023 22:33:52</publishTime>
@@ -412,7 +412,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>05/15/2018 15:29:52</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
<publishTime>10/01/2013 22:54:22</publishTime>
<publishTime>01/10/2013 22:54:22</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
<publishTime>10/20/2023 22:33:58</publishTime>
@@ -427,7 +427,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/01/0001 00:00:00</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
<publishTime>02/11/2014 15:26:04</publishTime>
<publishTime>11/02/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
<publishTime>10/20/2023 22:33:48</publishTime>
@@ -460,196 +460,196 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/04/2025 20:25:44</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>10/05/2016 15:11:52</publishTime>
<publishTime>05/10/2016 15:11:52</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
</File>
<File Include="bin/x64/libSkiaSharp.dll">
<publishTime>04/09/2024 19:24:38</publishTime>
<publishTime>09/04/2024 19:24:38</publishTime>
</File>
<File Include="bin/x86/libSkiaSharp.dll">
<publishTime>04/09/2024 19:24:38</publishTime>
<publishTime>09/04/2024 19:24:38</publishTime>
</File>
<File Include="Content/bootstrap-grid.css">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Content/bootstrap-grid.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.min.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.min.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.rtl.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.rtl.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.rtl.min.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-grid.rtl.min.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.min.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.min.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.rtl.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.rtl.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.rtl.min.css">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-reboot.rtl.min.css.map">
<publishTime>06/03/2024 09:16:16</publishTime>
<publishTime>03/06/2024 09:16:16</publishTime>
</File>
<File Include="Content/bootstrap-utilities.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.min.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.min.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.rtl.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.rtl.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.rtl.min.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap-utilities.rtl.min.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.rtl.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.rtl.css.map">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.rtl.min.css">
<publishTime>06/03/2024 09:16:15</publishTime>
<publishTime>03/06/2024 09:16:15</publishTime>
</File>
<File Include="Content/bootstrap.rtl.min.css.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Content/Site.css">
<publishTime>06/03/2024 08:11:55</publishTime>
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="favicon.ico">
<publishTime>06/03/2024 08:11:55</publishTime>
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="Global.asax">
<publishTime>07/19/2024 12:25:43</publishTime>
</File>
<File Include="Scripts/bootstrap.bundle.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.bundle.js.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.bundle.min.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.bundle.min.js.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.esm.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.esm.js.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.esm.min.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.esm.min.js.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.js.map">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.min.js">
<publishTime>06/03/2024 09:16:14</publishTime>
<publishTime>03/06/2024 09:16:14</publishTime>
</File>
<File Include="Scripts/bootstrap.min.js.map">
<publishTime>06/03/2024 09:16:13</publishTime>
<publishTime>03/06/2024 09:16:13</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.js">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.min.js">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.min.map">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.slim.js">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.slim.min.js">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/jquery-3.7.1.slim.min.map">
<publishTime>06/03/2024 09:16:17</publishTime>
<publishTime>03/06/2024 09:16:17</publishTime>
</File>
<File Include="Scripts/modernizr-2.8.3.js">
<publishTime>06/03/2024 08:12:04</publishTime>
<publishTime>03/06/2024 08:12:04</publishTime>
</File>
<File Include="Views/Home/APIGenerator.cshtml">
<publishTime>10/01/2024 20:21:44</publishTime>
<publishTime>01/10/2024 20:21:44</publishTime>
</File>
<File Include="Views/Home/Index.cshtml">
<publishTime>06/03/2024 08:11:55</publishTime>
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
<publishTime>06/03/2024 08:11:55</publishTime>
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
<publishTime>06/03/2024 10:48:16</publishTime>
<publishTime>03/06/2024 10:48:16</publishTime>
</File>
<File Include="Views/Web.config">
<publishTime>07/19/2024 12:25:43</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
<publishTime>06/03/2024 08:11:55</publishTime>
<publishTime>03/06/2024 08:11:55</publishTime>
</File>
<File Include="Web.config">
<publishTime>02/04/2025 21:33:02</publishTime>

BIN
API_NetFramework/bin/Database.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/Database.pdb
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

111
API_NetFramework/log.txt
View File

@@ -4223,3 +4223,114 @@ Parametername: encoder
2025-02-04 22:14:12.3750|DEBUG|OnDoc|
2025-02-04 22:14:12.3990|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-04 22:14:12.3990|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:46:36.1972|DEBUG|OnDoc|
2025-02-05 07:46:36.2384|DEBUG|OnDoc|
2025-02-05 07:46:36.2665|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:46:36.2665|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:46:36.3402|DEBUG|OnDoc|
2025-02-05 07:46:36.3497|DEBUG|OnDoc|
2025-02-05 07:46:36.3801|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:46:36.3801|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:46:36.4426|DEBUG|OnDoc|
2025-02-05 07:46:36.4426|DEBUG|OnDoc|
2025-02-05 07:46:36.4679|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:46:36.5555|DEBUG|OnDoc|
2025-02-05 07:46:36.5675|DEBUG|OnDoc|
2025-02-05 07:46:36.5827|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:48:30.2626|DEBUG|OnDoc|
2025-02-05 07:48:30.2951|DEBUG|OnDoc|
2025-02-05 07:48:30.3216|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:48:30.3216|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:48:30.3927|DEBUG|OnDoc|
2025-02-05 07:48:30.3927|DEBUG|OnDoc|
2025-02-05 07:48:30.4272|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:48:30.4272|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:48:30.4816|DEBUG|OnDoc|
2025-02-05 07:48:30.4846|DEBUG|OnDoc|
2025-02-05 07:48:30.4990|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:48:30.5779|DEBUG|OnDoc|
2025-02-05 07:48:30.5779|DEBUG|OnDoc|
2025-02-05 07:48:30.6014|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:48:57.8642|DEBUG|OnDoc|
2025-02-05 07:48:57.8742|DEBUG|OnDoc|
2025-02-05 07:48:57.8982|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:48:57.8982|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:48:57.9570|DEBUG|OnDoc|
2025-02-05 07:48:57.9570|DEBUG|OnDoc|
2025-02-05 07:48:57.9859|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:48:57.9859|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:48:58.0413|DEBUG|OnDoc|
2025-02-05 07:48:58.0413|DEBUG|OnDoc|
2025-02-05 07:48:58.0585|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:48:58.1204|DEBUG|OnDoc|
2025-02-05 07:48:58.1234|DEBUG|OnDoc|
2025-02-05 07:48:58.1234|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:49:26.9085|DEBUG|OnDoc|
2025-02-05 07:49:26.9085|DEBUG|OnDoc|
2025-02-05 07:49:26.9415|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:49:26.9415|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:49:27.0001|DEBUG|OnDoc|
2025-02-05 07:49:27.0001|DEBUG|OnDoc|
2025-02-05 07:49:27.0285|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:49:27.0308|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:49:27.0865|DEBUG|OnDoc|
2025-02-05 07:49:27.0865|DEBUG|OnDoc|
2025-02-05 07:49:27.1067|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:49:27.1659|DEBUG|OnDoc|
2025-02-05 07:49:27.1659|DEBUG|OnDoc|
2025-02-05 07:49:27.1865|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:49:51.3182|DEBUG|OnDoc|
2025-02-05 07:49:51.3272|DEBUG|OnDoc|
2025-02-05 07:49:51.3509|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:49:51.3509|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:49:51.4064|DEBUG|OnDoc|
2025-02-05 07:49:51.4064|DEBUG|OnDoc|
2025-02-05 07:49:51.4347|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:49:51.4367|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:49:51.4936|DEBUG|OnDoc|
2025-02-05 07:49:51.4936|DEBUG|OnDoc|
2025-02-05 07:49:51.5110|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:49:51.5715|DEBUG|OnDoc|
2025-02-05 07:49:51.5715|DEBUG|OnDoc|
2025-02-05 07:49:51.5883|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:50:43.5252|DEBUG|OnDoc|
2025-02-05 07:50:43.5342|DEBUG|OnDoc|
2025-02-05 07:50:43.5592|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:50:43.5612|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:50:43.6156|DEBUG|OnDoc|
2025-02-05 07:50:43.6156|DEBUG|OnDoc|
2025-02-05 07:50:43.6429|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 07:50:43.6429|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
2025-02-05 07:50:43.6991|DEBUG|OnDoc|
2025-02-05 07:50:43.7021|DEBUG|OnDoc|
2025-02-05 07:50:43.7021|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 07:50:43.7734|DEBUG|OnDoc|
2025-02-05 07:50:43.7734|DEBUG|OnDoc|
2025-02-05 07:50:43.7921|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1
2025-02-05 09:33:40.9239|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002488929
2025-02-05 09:33:40.9574|DEBUG|OnDoc|
2025-02-05 09:33:40.9574|DEBUG|OnDoc|
2025-02-05 09:33:40.9574|DEBUG|OnDoc|
2025-02-05 09:33:40.9734|DEBUG|OnDoc|
2025-02-05 09:33:40.9734|DEBUG|OnDoc|
2025-02-05 09:33:40.9834|DEBUG|OnDoc|
2025-02-05 09:33:42.2378|DEBUG|OnDoc|Start Transfer to OnBase
2025-02-05 09:33:42.3847|DEBUG|OnDoc|Ende Transfer to OnBase
2025-02-05 09:33:42.4059|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002488929
2025-02-05 09:33:42.4059|DEBUG|OnDoc|Start Updaet IL_Log: DokumentID:OFFEDK0082025002488929
2025-02-05 09:33:42.4059|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002488929
2025-02-05 09:33:42.4059|DEBUG|OnDoc|
2025-02-05 09:33:42.4059|DEBUG|OnDoc|
2025-02-05 09:33:42.4059|DEBUG|OnDoc|
2025-02-05 09:33:42.4700|DEBUG|OnDoc|
2025-02-05 09:33:42.4700|DEBUG|OnDoc|
2025-02-05 09:33:42.4700|DEBUG|OnDoc|
2025-02-05 10:48:04.6502|DEBUG|OnDoc|Start ArchivDocFromIRIS DokumentID: OFFEDK0002007001961170
2025-02-05 10:48:08.4988|DEBUG|OnDoc|
2025-02-05 10:48:08.5701|DEBUG|OnDoc|
2025-02-05 10:48:18.7516|INFO|OnDoc|Dokumentarchivierung von Iris ausgelöstOFFEDK0002007001961170
2025-02-05 10:48:24.5630|DEBUG|OnDoc|Ende ArchivDocFromIRIS DokumentID:OFFEDK0002007001961170
2025-02-05 11:30:14.6833|DEBUG|OnDoc|
2025-02-05 11:30:14.7145|DEBUG|OnDoc|
2025-02-05 11:30:14.7441|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
2025-02-05 11:30:14.7441|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

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

Binary file not shown.

13
API_NetFramework/obj/Release/API_NetFramework.csproj.FileListAbsolute.txt
View File

@@ -171,3 +171,16 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocIO.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.XlsIO.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Pdf.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.XlsIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Pdf.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.xml

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

Binary file not shown.

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

Binary file not shown.

BIN
BarcodeLib/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/BarcodeLib.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/BarcodeLib.pdb
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/Database.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/Database.pdb
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/Model.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/Model.pdb
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/VBFileManagement.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Release/VBFileManagement.pdb
View File

Binary file not shown.

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

Binary file not shown.

BIN
BarcodeLib/obj/Release/BarcodeLib.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
BarcodeLib/obj/Release/BarcodeLib.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
a1961adabd69ca28b8fa579e73dfd4ca48240f80b5151949e01c1bdf53f2af14
db3083acc9452ec1e99ba7d8e719bf6f0d3d084294d691e7d24d0a8f0c6856c4

BIN
BarcodeLib/obj/Release/BarcodeLib.dll
View File

Binary file not shown.

BIN
BarcodeLib/obj/Release/BarcodeLib.pdb
View File

Binary file not shown.

0
Client/obj/Release/build.force → BarcodeLibVBDatamatrix/obj/Debug/build.force
View File

7
BarcodeLibVBDatamatrix/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.vb Normal file
View File

@@ -0,0 +1,7 @@
' <autogenerated/>
Option Strict Off
Option Explicit On
Imports System
Imports System.Reflection
<Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName:=".NET Framework 4.8")>

BIN
BarcodeLibVBDatamatrix/obj/Release/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache Normal file
View File

Binary file not shown.

BIN
BarcodeLibVBDatamatrix/obj/Release/TempPE/My Project.Resources.Designer.vb.dll Normal file
View File

Binary file not shown.

0
BarcodeLibVBDatamatrix/obj/Release/build.force Normal file
View File

5
Client/Client.csproj
View File

@@ -1322,6 +1322,11 @@
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc.ico" />
<None Include="Resources\ShowDoc_24x24-32.png" />
<None Include="Resources\ShowDoc_16x16-32.png" />
<None Include="Resources\ShowDoc_256x256-32.png" />
<None Include="Resources\ShowDoc_48x48-32.png" />
<None Include="Resources\ShowDoc_32x32-32.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
Client/Client.csproj.user
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>
</StartArguments>
<StartArguments>ondoc:%3fpartnernr=1000208&amp;struktur=Verträge&amp;funktion=createdoc&amp;id=OFFEDK0082025002488929</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>

214
Client/Diverses/MitarbeiterProfil.Designer.cs generated
View File

@@ -54,10 +54,7 @@
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.GrpBoxMitarbeiter = new System.Windows.Forms.GroupBox();
this.GrpGetSignature = new System.Windows.Forms.GroupBox();
this.btnDeleteImage = new System.Windows.Forms.Button();
this.btnSaveSignature = new System.Windows.Forms.Button();
this.sign1 = new WinSign.Sign();
this.button2 = new System.Windows.Forms.Button();
this.chkOndocMails = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button();
this.btnLoadImage = new System.Windows.Forms.Button();
@@ -78,18 +75,24 @@
this.lblVorname = new System.Windows.Forms.Label();
this.txtName = new System.Windows.Forms.TextBox();
this.lblName = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.GetSignatureAbort = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label();
this.GrpGetSignature = new System.Windows.Forms.GroupBox();
this.label15 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.GetSignatureAbort = new System.Windows.Forms.Button();
this.btnDeleteImage = new System.Windows.Forms.Button();
this.btnSaveSignature = new System.Windows.Forms.Button();
this.sign1 = new WinSign.Sign();
this.label16 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.GrpBoxProfile.SuspendLayout();
this.GrpBoxDetails.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftRechts)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftLinks)).BeginInit();
this.GrpBoxMitarbeiter.SuspendLayout();
this.GrpGetSignature.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.GrpGetSignature.SuspendLayout();
this.SuspendLayout();
//
// ribbon1
@@ -368,56 +371,15 @@
this.GrpBoxMitarbeiter.TabIndex = 3;
this.GrpBoxMitarbeiter.TabStop = false;
//
// GrpGetSignature
// button2
//
this.GrpGetSignature.BackColor = System.Drawing.Color.Gainsboro;
this.GrpGetSignature.Controls.Add(this.label14);
this.GrpGetSignature.Controls.Add(this.label13);
this.GrpGetSignature.Controls.Add(this.GetSignatureAbort);
this.GrpGetSignature.Controls.Add(this.btnDeleteImage);
this.GrpGetSignature.Controls.Add(this.btnSaveSignature);
this.GrpGetSignature.Controls.Add(this.sign1);
this.GrpGetSignature.Location = new System.Drawing.Point(101, 99);
this.GrpGetSignature.Name = "GrpGetSignature";
this.GrpGetSignature.Size = new System.Drawing.Size(644, 364);
this.GrpGetSignature.TabIndex = 21;
this.GrpGetSignature.TabStop = false;
this.GrpGetSignature.Text = "Unterschrift erfassen";
this.GrpGetSignature.Visible = false;
//
// btnDeleteImage
//
this.btnDeleteImage.Location = new System.Drawing.Point(11, 327);
this.btnDeleteImage.Name = "btnDeleteImage";
this.btnDeleteImage.Size = new System.Drawing.Size(103, 23);
this.btnDeleteImage.TabIndex = 22;
this.btnDeleteImage.Text = "Bild löschen";
this.btnDeleteImage.UseVisualStyleBackColor = true;
this.btnDeleteImage.Click += new System.EventHandler(this.btnDeleteImage_Click);
//
// btnSaveSignature
//
this.btnSaveSignature.Location = new System.Drawing.Point(498, 327);
this.btnSaveSignature.Name = "btnSaveSignature";
this.btnSaveSignature.Size = new System.Drawing.Size(129, 23);
this.btnSaveSignature.TabIndex = 21;
this.btnSaveSignature.Text = "Unterschrift speichern";
this.btnSaveSignature.UseVisualStyleBackColor = true;
this.btnSaveSignature.Click += new System.EventHandler(this.btnSaveSignature_Click);
//
// sign1
//
this.sign1.BackColor = System.Drawing.Color.White;
this.sign1.BackgroundImageBitmap = null;
this.sign1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.sign1.FileFormat = System.Drawing.Imaging.ImageFormat.Bmp;
this.sign1.Location = new System.Drawing.Point(11, 93);
this.sign1.Name = "sign1";
this.sign1.PenColor = System.Drawing.Color.Black;
this.sign1.PenWidth = 4;
this.sign1.RequiredPoints = 20;
this.sign1.Size = new System.Drawing.Size(616, 228);
this.sign1.TabIndex = 20;
this.button2.Location = new System.Drawing.Point(386, 208);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(147, 23);
this.button2.TabIndex = 22;
this.button2.Text = "Unterschrift erfassen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// chkOndocMails
//
@@ -591,45 +553,122 @@
this.lblName.TabIndex = 0;
this.lblName.Text = "Name";
//
// button2
// GrpGetSignature
//
this.button2.Location = new System.Drawing.Point(386, 208);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(147, 23);
this.button2.TabIndex = 22;
this.button2.Text = "Unterschrift erfassen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
this.GrpGetSignature.BackColor = System.Drawing.Color.Gainsboro;
this.GrpGetSignature.Controls.Add(this.label17);
this.GrpGetSignature.Controls.Add(this.label16);
this.GrpGetSignature.Controls.Add(this.label15);
this.GrpGetSignature.Controls.Add(this.label14);
this.GrpGetSignature.Controls.Add(this.label13);
this.GrpGetSignature.Controls.Add(this.GetSignatureAbort);
this.GrpGetSignature.Controls.Add(this.btnDeleteImage);
this.GrpGetSignature.Controls.Add(this.btnSaveSignature);
this.GrpGetSignature.Controls.Add(this.sign1);
this.GrpGetSignature.Location = new System.Drawing.Point(101, 99);
this.GrpGetSignature.Name = "GrpGetSignature";
this.GrpGetSignature.Size = new System.Drawing.Size(644, 394);
this.GrpGetSignature.TabIndex = 21;
this.GrpGetSignature.TabStop = false;
this.GrpGetSignature.Text = "Unterschrift erfassen";
this.GrpGetSignature.Visible = false;
//
// GetSignatureAbort
// label15
//
this.GetSignatureAbort.Location = new System.Drawing.Point(524, 19);
this.GetSignatureAbort.Name = "GetSignatureAbort";
this.GetSignatureAbort.Size = new System.Drawing.Size(103, 23);
this.GetSignatureAbort.TabIndex = 23;
this.GetSignatureAbort.Text = "Abbrechen";
this.GetSignatureAbort.UseVisualStyleBackColor = true;
this.GetSignatureAbort.Click += new System.EventHandler(this.button3_Click);
//
// label13
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(11, 31);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(198, 17);
this.label13.TabIndex = 24;
this.label13.Text = "Unterschrift mit Stift erfassen. ";
this.label15.AutoSize = true;
this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label15.Location = new System.Drawing.Point(615, 7);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(23, 22);
this.label15.TabIndex = 26;
this.label15.Text = "X";
this.label15.Click += new System.EventHandler(this.label15_Click);
//
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label14.Location = new System.Drawing.Point(11, 53);
this.label14.Location = new System.Drawing.Point(11, 46);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(400, 17);
this.label14.TabIndex = 25;
this.label14.Text = "Bitte möglichst den gesamten Paltz des Eingabefeldes nutzen.";
this.label14.Text = "Bitte möglichst den gesamten Platz des Eingabefeldes nutzen.";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(11, 26);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(198, 17);
this.label13.TabIndex = 24;
this.label13.Text = "Unterschrift mit Stift erfassen. ";
//
// GetSignatureAbort
//
this.GetSignatureAbort.Location = new System.Drawing.Point(524, 55);
this.GetSignatureAbort.Name = "GetSignatureAbort";
this.GetSignatureAbort.Size = new System.Drawing.Size(103, 23);
this.GetSignatureAbort.TabIndex = 23;
this.GetSignatureAbort.Text = "Abbrechen";
this.GetSignatureAbort.UseVisualStyleBackColor = true;
this.GetSignatureAbort.Visible = false;
this.GetSignatureAbort.Click += new System.EventHandler(this.button3_Click);
//
// btnDeleteImage
//
this.btnDeleteImage.Location = new System.Drawing.Point(11, 365);
this.btnDeleteImage.Name = "btnDeleteImage";
this.btnDeleteImage.Size = new System.Drawing.Size(103, 23);
this.btnDeleteImage.TabIndex = 22;
this.btnDeleteImage.Text = "Bild löschen";
this.btnDeleteImage.UseVisualStyleBackColor = true;
this.btnDeleteImage.Click += new System.EventHandler(this.btnDeleteImage_Click);
//
// btnSaveSignature
//
this.btnSaveSignature.Location = new System.Drawing.Point(498, 365);
this.btnSaveSignature.Name = "btnSaveSignature";
this.btnSaveSignature.Size = new System.Drawing.Size(129, 23);
this.btnSaveSignature.TabIndex = 21;
this.btnSaveSignature.Text = "Unterschrift speichern";
this.btnSaveSignature.UseVisualStyleBackColor = true;
this.btnSaveSignature.Click += new System.EventHandler(this.btnSaveSignature_Click);
//
// sign1
//
this.sign1.BackColor = System.Drawing.Color.White;
this.sign1.BackgroundImageBitmap = null;
this.sign1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.sign1.FileFormat = System.Drawing.Imaging.ImageFormat.Bmp;
this.sign1.Location = new System.Drawing.Point(11, 126);
this.sign1.Name = "sign1";
this.sign1.PenColor = System.Drawing.Color.Black;
this.sign1.PenWidth = 4;
this.sign1.RequiredPoints = 20;
this.sign1.Size = new System.Drawing.Size(616, 228);
this.sign1.TabIndex = 20;
//
// label16
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label16.Location = new System.Drawing.Point(11, 77);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(315, 17);
this.label16.TabIndex = 27;
this.label16.Text = "Prokuristen der Unterschrift den Zusatz \"pp\" und";
//
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(11, 95);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(361, 17);
this.label17.TabIndex = 28;
this.label17.Text = "Handlungsbevollmächtige den Zusatz \"i.V.\" voransetzen";
//
// MitarbeiterProfil
//
@@ -658,9 +697,9 @@
((System.ComponentModel.ISupportInitialize)(this.cbboxUnterschriftLinks)).EndInit();
this.GrpBoxMitarbeiter.ResumeLayout(false);
this.GrpBoxMitarbeiter.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.GrpGetSignature.ResumeLayout(false);
this.GrpGetSignature.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
}
@@ -720,5 +759,8 @@
private System.Windows.Forms.Button GetSignatureAbort;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label17;
}
}

5
Client/Diverses/MitarbeiterProfil.cs
View File

@@ -441,6 +441,11 @@ namespace OnDoc.Diverses
{
GrpGetSignature.Visible = true;
}
private void label15_Click(object sender, EventArgs e)
{
GrpGetSignature.Visible = false;
}
}
}

4
Client/Diverses/SaveAnsicht.Designer.cs generated
View File

@@ -55,7 +55,7 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(30, 87);
this.button1.Location = new System.Drawing.Point(283, 89);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 2;
@@ -65,7 +65,7 @@
//
// button2
//
this.button2.Location = new System.Drawing.Point(283, 87);
this.button2.Location = new System.Drawing.Point(30, 89);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 3;

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

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(165, 26);
this.label2.TabIndex = 2;
this.label2.Text = "4. Februar 2025";
this.label2.Text = "5. Februar 2025";
//
// SplashScreen
//

3
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -192,6 +192,7 @@ namespace OnDoc.DocMgmt
this.ribbonPanel3.Items.Add(this.ribbonButtonCreate);
this.ribbonPanel3.Name = "ribbonPanel3";
this.ribbonPanel3.Text = "Erstellen";
this.ribbonPanel3.Visible = false;
//
// ribbonButtonCreate
//
@@ -624,7 +625,7 @@ namespace OnDoc.DocMgmt
this.toolStripButton4.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 20);
this.toolStripButton4.Size = new System.Drawing.Size(23, 45);
this.toolStripButton4.Text = "Fachverantwortung initialisieren";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//

284
Client/DocMgmt/DokTypSelect.resx
View File

@@ -124,153 +124,152 @@
<data name="imageListAdv1.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAB45SURBVHhe7d1r
jOWHWd9xY6/XO3vxeq+zu0m4JGkCrHddhFrSCgGVWopAFVRtVPVFVZWWIpVeQJVAVG3VCtQiQIhXrZAK
QvQiREtLoaCQ0AbaJHbs9SXeOWdm7Rk7wSgFEgINIfGec2b/PWd5kCLvQ2J7d2Z+Z/bzlT7yW+s5c/6/
2dmZ2XskSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAB2+SURBVHhe7d17
jKWHXd5xx7HXe/V6r7O7SbgkaQLYOy5CLWmFgEotRaAKqjaq+kdVlZYilV5AlYio2qoVqEWAEH+1QioI
0Ysq2rQUCgoJbaDEseN74jlnZu0ZOyEoBRICDSHxnvfMvtVZ0ip6XjvxZXfnmd3PV/r8b/3OnPdZz86c
ve02SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
SZIkSVq2hudPPnh948I3TzfO/tB0fOa/Tsen3j1bP/PodHRyNBmd2JqOTrzE/jIZn3hxOj45no5OPTUd
n/612frqT0zH5757un7h64crFw7Xh4Ykab80vPjQQ9vXzn/X/KH/v6fjh357tnZkMl07NEyvPgBl/vGw
dvxT808Q1ibj1R8fnl99R334SJKWqdnGuXfO/1T/K/OH+iduPtzbhz788WbjY5+Zf9L42GT9/LfXh5Uk
KbHh+bNvmY3P/vvp2oN/0D3Q4XVbOzK9+VdE4/NfUx9ukqS9bvva6j9ZfGnfn/TZcWuHhsnoxEeuX1v9
a/XhJ0nazYbhngPbG6s/MBsd/1T7oIadNjr+scnGub9VH5KSpJ1sPvz3bo9Xf3S6dvTl9qEMu2w2Pvmi
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
SUVORK5CYII=
kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiSpvf8LoCKHvn6o2zAAAAAASUVO
RK5CYII=
</value>
</data>
<data name="imageListAdv1.Images1" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAmhJREFUWEdjAIHkjivry5f8/08qLp737Wdo6TY/sCGUAHIdAMJUcQTMAf65qwKg
QgQBsqMpdgQlDkjpun6JYkdQ4gCfjMWByZ1Xp1HkCEocANXDSJEjKHFAztTny4F0Q/H87w2Fsz+9IssR
lDgAF07ruXUeqpQwINMBEUA9Deg4e/LT6UCa9g7ABayD6g0GlQPUzULZgos3h4AlcQFaOQBkeUb//Y0g
fkz9sQqoEkyA7oDI6v0WQD5G/BLAYL0wBwALqKswy2EYpyOwOKAAWSOReD5IL8wBMAzMmh9iG453ly78
/Q/Ex+oIWoQACIMsB5ppDjUzE6cjqJUGkOMc6oBXQDN1odIgR1TA5IDsDKgwdRyAbDnI59mTnx1DdgQw
ZESzpzwHV1x5M97edk+aKQPViukAv+zlmUDD3pOCgYZ/glkONMcc6CAuoPhemCOARfYVrJaDAJUSIdxy
sKFAAHJE1uQn+2DyWC0HASxRwA7EAoQwF5+4WFzTaZgvUSwHAbzBjgzISQPocU625SCA7gCnmH5DUDTg
wxkTHmyniuUgQG4aoIrlIIDFAW5A/nx0XDjn81JgYfIHyCZoef7Md6+IshwEiE0D6X13lxBjOQhTvToG
JjqB4nnffwHxH0KWk+0Ax6ieaCAXa5bzyVwcC1KTPeXZUSAfDrBZDsJkOYAYDEz9NVBtOC0HYZo5wCGy
2yW++Ux05sRHS4AJ7S02NSBMkgMIAa+0+aYwg4Fp4C+yRTlTX1wmOrWTCzInPATV9zAH/M6d9mo/sMVT
5hI7UQeqhLYgtuHEFmDimx/XeDIMlBugwlQADAwAs6jFs/dlDrcAAAAASUVORK5CYII=
vAAADrwBlbxySQAAAnZJREFUWEdjYGBgYEjuuLK+fMn//6Ti4nnffoaWbvMDmUERINcBVHMEzAH+uasC
0OVwAWRHU+wIShyQ0nX9EsWOoMQBPhmLA5M7r06jyBGUOACqh5EiR1DigJypz5eXL/nfUDz/e0Ph7E+v
yHIEJQ7AhdN6bp1H14MTkOmACJDP0XH25KfT6eIAXMA6qN5gUDlA3SyULbh4cwi6OhRAKweALM/ov78R
xI+pP1aBrhYO0B0QWb3fAj1uicBgvTAHpHRdvwqzHIZxOgKLAwqQNRKJ54P0whwAw4WzP32IbTjeXbrw
9z8QH6sjsDiA4hCAWe6fu8ocamYmTkegO4BcgBznUAe88s9dpQuTj6zeXwGTi6zenwHXSA0HIFsO8nn2
5GfHkB1hHVQvmj3lObjiypvx9rZ70kwZuGZ0B/hlL8/M6L//nhScPeX5J+RgVzcL5crov78X5oicqc+v
YLUcmwPITIQocQ4CIEdkTX6yDyaP1XIQQHcAAwMDOwMDgwAhzMUnLhbXdBrmSxTLQQBvsCMDLA4gCNDj
nGzLQQDdAU4x/YagaMCHMyY82E4Vy0EA3QHEpgGqWA4CWBzgBirZ0HHhnM9LSxf+/kOM5fkz370iynIQ
QHcALpDed3cJMZaDMNWrY3WzUIHied9/Fc/7/oeQ5WQ7wDGqJxo9q8GwT+biWJCa7CnPjiLrxWY52Q4g
BmdMeFAD04fLcpo6wCGy2yW++Ux05sRHS/JnvnuLLk+WAwgBr7T5pjCDi+d9/4tsUc7UF5eJTu3kgswJ
D0H1PcwBv3Onvdqf0nW9zCV2og66WpqA2IYTW7KnPJsf13gyDJQb0OUpAQCzqMWziIbI5wAAAABJRU5E
rkJggg==
</value>
</data>
<metadata name="contextMenuStripVorlagen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -284,7 +283,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
DAAAAk1TRnQBSQFMAgEBBgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -344,9 +343,6 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>618, 16</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>723, 16</value>
</metadata>

2
Client/DocMgmt/frmNote.Designer.cs generated
View File

@@ -86,7 +86,7 @@
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 5;
this.button2.Text = "Abbruch";
this.button2.Text = "Abbrechen";
this.button2.UseVisualStyleBackColor = true;
//
// frmNote

2
Client/DocMgmt/frmToApproval.Designer.cs generated
View File

@@ -120,7 +120,7 @@
this.btncancel.Name = "btncancel";
this.btncancel.Size = new System.Drawing.Size(171, 23);
this.btncancel.TabIndex = 19;
this.btncancel.Text = "Abbruch";
this.btncancel.Text = "Abbrechen";
this.btncancel.UseVisualStyleBackColor = true;
this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
//

2180
Client/DocMgmt/frmToApproval.resx
View File

File diff suppressed because it is too large Load Diff

54
Client/Klassen/clsAppParams.cs
View File

@@ -1,11 +1,12 @@
using Database;
using Syncfusion.Data.Extensions;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security.Policy;
@@ -156,6 +157,8 @@ namespace OnDoc.Klassen
public static string Interaktion { get; set; } = "Yes";
public static string showdoc { get; set; } = "Yes";
public static string dokumentid { get; set; } = "";
public static string unterschriftenpruefung { get; set; } = "No";
public static Boolean parseparams()
{
@@ -221,6 +224,55 @@ namespace OnDoc.Klassen
case "showdoc":
showdoc = value;
break;
case "id":
try
{
dokumentid = value;
if (dokumentid.Length > 9)
{
if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008")
{
DB db2 = new DB(AppParams.connectionstring);
db2.Get_Tabledata("Select count(*) from doks where dokumentid = '" + dokumentid+"'", false, true);
if (db2.dsdaten.Tables[0].Rows.Count < 1)
{
dokumentid = "";
break;
}
db2.Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid+"'", false, true);
if (db2.dsdaten.Tables[0].Rows.Count > 0)
{
if (MessageBox.Show("Das Dokument "+ Environment.NewLine+Environment.NewLine + dokumentid+Environment.NewLine + db2.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString()+ Environment.NewLine+Environment.NewLine + " bearbeiten (Ja) oder ein neues Dokument erstellen (Nein)", "OnDoc", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
dokumentid = "";
}
else
{
db2.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='"+dokumentid+"'", false, true);
if (db2.dsdaten.Tables[0].Rows[0]["status_bezeichnungnr"].ToString() == "-1")
{
db2.Get_Tabledata("Select * from mitarbeiter where mitarbeiternr=" + db2.dsdaten.Tables[0].Rows[0]["verantwortlich"].ToString(), false, true);
if (db2.dsdaten.Tables[0].Rows.Count > 0)
{
string user = db2.dsdaten.Tables[0].Rows[0]["name"].ToString();
user = user + db2.dsdaten.Tables[0].Rows[0]["vorname"].ToString();
user = user + ", "+ db2.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString();
MessageBox.Show("Das Dokument ist bereits bei " + user + " in Bearbeitung.", "OnDoc", MessageBoxButtons.OK, MessageBoxIcon.Information);
dokumentid = "";
}
}
}
}
db = null;
}
}
}
catch {
dokumentid = "";
}
break;
}
}
return true;

10
Client/Program.cs
View File

@@ -37,11 +37,11 @@ namespace OnDoc
{
ExternalCall.sourceparam = "";
try
{
MessageBox.Show(args[0]);
}
catch { }
//try
//{
// MessageBox.Show(args[0]);
//}
//catch { }
if (args.Length > 0)
{

50
Client/Properties/Resources.Designer.cs generated
View File

@@ -2710,6 +2710,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ShowDoc_16x16_32 {
get {
object obj = ResourceManager.GetObject("ShowDoc_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ShowDoc_24x24_32 {
get {
object obj = ResourceManager.GetObject("ShowDoc_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ShowDoc_256x256_32 {
get {
object obj = ResourceManager.GetObject("ShowDoc_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ShowDoc_32x32_32 {
get {
object obj = ResourceManager.GetObject("ShowDoc_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ShowDoc_48x48_32 {
get {
object obj = ResourceManager.GetObject("ShowDoc_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>

15
Client/Properties/Resources.resx
View File

@@ -913,6 +913,21 @@
<data name="Select_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Select_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowDoc_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowDoc_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowDoc_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowDoc_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowDoc_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowDoc_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowDoc_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowDoc_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowDoc_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowDoc_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Versandstrasse_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Versandstrasse_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
Client/Resources/ShowDoc_16x16-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 631 B

BIN
Client/Resources/ShowDoc_24x24-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Client/Resources/ShowDoc_256x256-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
Client/Resources/ShowDoc_32x32-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Client/Resources/ShowDoc_48x48-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

10
Client/Start.cs
View File

@@ -253,6 +253,16 @@ namespace OnDoc
}
if (ExternalCall.function.ToLower() == "createdoc")
{
if (ExternalCall.dokumentid !="")
{
DB db = new DB();
db.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString());
db = null;
dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false);
return;
}
if (ExternalCall.Interaktion == "Yes")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));

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

File diff suppressed because it is too large Load Diff

8
Client/UIControls/DokList.cs
View File

@@ -492,6 +492,9 @@ namespace OnDoc.UICintrols
{
db.Exec_SQL("Update dokument set verantwortlich=" + AppParams.CurrentMitarbeiter.ToString() + " where dokumentid='" + selected_dokumentid + "'");
Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
}
else
{
return;
}
}
@@ -2397,6 +2400,11 @@ namespace OnDoc.UICintrols
}
private void ribbibButtonShowDoc_Click(object sender, EventArgs e)
{
dokumentAnzeigenToolStripMenuItem_Click(sender, e);
}
}

49
Client/UIControls/DokList.resx
View File

@@ -121,49 +121,6 @@
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="dokumentBearbeitenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAuhJREFUaEPt
mUvLTVEYx38SKYmBRCRjEwxILrmk8AXIQOQ+kolSrinlA7yFDCUDKfIBTMhAUShmUnLNPSHXHtbS0/Ou
vfbeZ+9nnz3wr3+9Z+911nl+e/33s/Z7DvzVFOAz8KtlfwCWhM9wlReA+B2w1H5g2/IEEAuE60pogLfA
BDugpk4mIFzj1AVAXAmXOHkCXATeeMfJE+AAsBB47RknbwCRQNiVaC1OXQCIFiUgWlkJT4AzwErl/cCP
tuPkCVDFshJz7CR1NGwA8WI7SR21DbALuFbB7/sKUFU3/wME9Q1gMjBDvS5VnwCk+OvAQ2CmGV+ovgBM
Am6oYw+qQuQA5pqNqImXqXlFGmCtKT5aVmKWed8o5QAuJCYd1DK3lgZ4ov7+aXbr0jj1ASBaij8EbDUQ
2TjlAI4kNqBBfVXNK7IAUvxBdX4L8E2dL4xTDsBL0m0eGYArdlBYCQsxaiW6BrDdJlois9MOBo6ZcbeA
sXpAlwBy5XXxEpvnBmK3Gr8AeKXOfwRWqPN/lANYA+xpyVKYbFK6eLlhpwP31PHvYawU/1Idl/8dVqna
/ikH0GYX0o7FjwmfIxD31XlZCaklvpYrnyxe1DWA7TZR0wxEdDI2WjmA7cCpBpYLoPt5vPJFWmeKL4yN
Vg6giWy3sbGxmpe4YUuLF3kApLpNKjZRlbpNkdoGiI/E9soXqXK3KVIOYG/IcR3fTRTfemy0cgBNupBr
bLQ8ANxjo5UDWA/sK/Fh4Eui+KqxEW+wg+ooB1CmiQ27TfTQvpXYmLjyRbKx6QXAOVWE7Lx1YjN0gHHA
U1XEcjsgqCg2LgBfgbPA6Qo+rwp4AYy3E5fExgVgUEu7tSqLjfbQATaH/M8GdgCXgU+JcUVuBCCZl+5x
tIZHTAESqdvm0TlaNqkTiTm0k982eGpbotCUHzfZYT11KVGsWHZkeRKVH/fm2zf1RRI5/Wvjs7AfbAKm
2sF91GrgDnA83Hyp9tmJfgNWbQeVbZknlAAAAABJRU5ErkJggg==
</value>
</data>
<data name="dokumentLöschenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABIJJREFUaEPt
WkmoHUUUPae+mijEATFxJhpiiCiKC92pUVBQE4izcdgpokFQCWgcwI0RxU0iiEjEAV1EXEhcuDCOQRTU
RAXBkShGRBEVjTHGidPV/f/t26/69/fV65eFBw7//a6qe+/pmm7Ve0ABXgjwfYB/AuEfgC1UeVcWbX4H
+C7A2wEeHP1lBZfHwG1wPuihBFh+C/A8H8GQ4HvNABuOcwnQ851AWO6jGALq4klnxwET+wGhhSrvStXn
m00R/CMO2ywIu81bO8CXDg9uNoFrPtjPl/ja/wHcbYyOWsD1AL9wIi71LWaIXgWcA3A+wM/MM/m/zLea
AfoWUDzzInYBXOFbdsQ4BBTP5wPh0wwixiVACEcD/NiUaz+6vF5nWoxTQIGjnIgdABf7Si1ICggAbwTC
w93IBwAeYdqX4EZj//Vmu6KtrSM+7a20ILUPcFlzZ52OfM5aLu1c7YLrwl8B7u8tJZAUsATgX80g28jH
rOUSEwAfirYagbbxVG8ogZQAEOC5AG8BeGsHXgtgjmlvIVunAFw5oJ1h+NIIWOKNJJAUMAaEt/4X4Ev7
RVYB1LhV7nLziHgdALfS5BVw5sxXIc/GyuLp1vu8ApZFQ1UgPrgubATs+YKNJLOAYideCYRHRkM+CFC5
0KEAbwC4AQi/GAHvlLv76QAnTFweSQEjBucBVBrx24Ce8dwKcGncTxpI5kIjBM8ubyh8oG3UTr4e4Gxv
rGcBvKjM/Suff5f3RqvK4bII4EnxlMbHy7zICnkJwL7WYIsA3VLw/Iy8pkyXK3/qBR3sQ92vBY8E+KwT
8aQZTikBRe6y0zXMyc8BHjvlrxVaUNaYtuq16kYjKUBd6J3monrh+ClfnaCN9Rlj4xMA+7QIwGyAawFu
AvjykHzF+bnb+EmACwGe5p5p5frR2LmgTUBGFHOpOg/o7R9iC+NJja8BPKx8tBjg9/HeCLauytaZeB/t
S8CVxscmV6bxXd1ObAN4lvl/YzwQ1eorP6tsfdCXgNXGxzpfGs/SfLss1wTV3y2Dj5XFqlTZ+rkvAfdM
+Qj3+dII+eZ2E8sdvkYEDzJ1dvUlQMfSysd6X6oKAO+dCmqyFyTWDyFN7srWd30JWGp8bI0B18o1RzTJ
FYuyYJ2ddQWv+jo32LorjK3NfQmYa67WFegJrvz+8q3fZJ5p59bq5G4n+LyJd01uAbOAMBeYGEC+avxs
qDfjXgAX1J8NgsRMxqsXcXJGAcXqYO/+26i3fZW3MA0OBPihsfFiORSzCZhp6qE86wpvZTC08dXuWHWG
OLEqzCQAWt7eAPhTC3+IK8ekP/XEEy1J3awyg7XLq9rYiZ1NQAWlxilquVwQE7Fab2jFUSqhyaxbujsB
PgXwG1dP4/425y+7gA4ohoRdTbpQudHF3tKYBBRQb2ip1Ju3MXjq0KOzQOpb/rEJMOAx8Ro+fGViUdap
I6Y/A3vUvrtd1PxiuzfOAcJHJpYzfKQJ+J8a7BFUPnS4jzQB+2OPPYZrfZTToPi5jS6PxilE6/vXAO8C
uLePMIV/AVxyXnJs/RKjAAAAAElFTkSuQmCC
</value>
</data>
<data name="archivierenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADVtJREFUaEPV
@@ -549,6 +506,9 @@
<metadata name="pdfConfig2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>464, 17</value>
</metadata>
<metadata name="ctxMenuGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>578, 17</value>
</metadata>
<data name="ribbonButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -567,7 +527,4 @@
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="ctxMenuGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>578, 17</value>
</metadata>
</root>

2
Client/UIControls/Partnersuche.Designer.cs generated
View File

@@ -241,7 +241,7 @@
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Style.TitleBar.BackColor = System.Drawing.Color.Silver;
this.Text = "Partner-Suche";
this.Text = "Kunden-Suche";
this.Load += new System.EventHandler(this.Form1_Load);
this.groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.trefferlistedata)).EndInit();

23
Client/UIControls/Partnersuche.resx
View File

@@ -123,18 +123,17 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnbpperson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAJDSURBVEhLtZXPSxtREMfX2FaUpK3a+AMJNkpCUCOCp1bwUJAWD2JpD6WX2vbqLZoU601Fz62H
erIlgngXhNJehNwKhSL+GR4U/EE02/m83bftrlF4i/nCkJdh9vvdmXkzawXQKTYr9lHsg6HxDM/CURUv
xGbEYupfOETF4IDLBxyTzvFGAJcnQkqo3jTgVOWibqQWRDo5+HS3Z2i8JOd+x+VDROyl2HOxOhwBUGq4
VXMuoTHauphbPy3PfiufN3ekVl23RkR8X17P7x6+mvt5dPdB9yfxVRNR3NyAS4i1JFbyxYqNJQefbbpu
UC/ka+9X9s4KG7aNvV36feqKkNX/UNwmAry5Qy7+QtG28xv8VuwpEbnf1hsUMRO43RDNvVv+c1KAVBkZ
/Du/Wfh1fOtO07QicGAm0NKZWcsXLyq59ZPyo4m5A12i7OjU/szXs3Pp14Vk8VkRODATEAw8HBj70ZUe
2U5kRku6RI2x+Jb83+nue/JdYjJOqIKxgIfU8OSmLhGxrjuI6wV4Q6znWgHbSCBDmqTbJGmrGyIEXanH
JcpCeSQmS2AoARpEo2gYjdNXkYbSWBpMo4kNJcAV46rp0gSNK8pVJTZsiSIMiwyNmlJdIozhYsiIITCs
AIgw9jL+3rQq8nZFXu+EmAlUW3Z1iMgiO5SFdnQvnvTeXCOeyK6yCFmILEbXHYTivmpdsx1Zxazk4BID
/axyVrqc047LB29d1+qD4/s+1/STqYED1Zp89DVICRGaww0wMZ7xlcWyLOsvDFd8XAJMOgUAAAAASUVO
RK5CYII=
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAj5JREFUSEu1
Vs9LG0EYfcZWUZJq1NiIBBtlZVEjhZ5aIYdCafEgSnsQL4169RaTlOhNQz1XD/VkJQHxLhRKvQRyKwRK
8c/woKCRaKa86U7cjD9gUvPgI2G/2fdmvl+zQC36ACQArAD4ZGh8h++S41a8B7AMwKc7DOB1OMhVAz6Y
1h/+B8hVFeGRqPrQIKcMF+PGo+kYDo+/zQ8+nywAGNWdADwAPgCYAdCkO51Qk1sm5wbavN3r8Z1SObFb
vvQHrS3N7fEHra9zq/mT2fTh6ZOegS93iEhuVsAN+LpCG8lsRdDC4+/2XK5mf9DaXtz4c5HKCUGbzxRL
jghP5YbkNhHgzv+RZysilRUimeNvRcQyxVJn75AuYibwuNUbX/j8+zxFUmk8wfX/j2u/zh61tC+5aMwE
uvrs7WT2qhLfOS+/nEofqxBForGj5W8Xl4nd8lVn79Cmi8ZMAMDYs7E3P/uHJw5CdrSgQtTmC+yH7Oj3
gZHXPwDYLhpjgSqsF9N7KkRcq/sd3C/AHdIG7xUQRgI2j8njtvsC+7JCckL0W68KDAvDAyDChXUJMEFM
FBPGxKlSZEKZWCaYiebaugRYYiw1FRrdWKIsVa6tS4BNwmaJZYqyS1WIaGwuNplqpHoFCA/bfp4iTogk
+VNJ3qwWmQjcNuyaKDKbPjyZW82fdgTC1Z0rBEKRLQ5CDkQORrfPBcl917jmdOQo5kjWhxgxylHOkc7R
rjvd47pRF07N/dzQK1OBD6jakEtf4cE/W/4CDFd8XLzvqwoAAAAASUVORK5CYII=
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

24
Client/UIControls/Serienbrief.Designer.cs generated
View File

@@ -177,12 +177,12 @@
this.GrpDokumentInhalt.Controls.Add(this.groupBox5);
this.GrpDokumentInhalt.Dock = System.Windows.Forms.DockStyle.Top;
this.GrpDokumentInhalt.Enabled = false;
this.GrpDokumentInhalt.Location = new System.Drawing.Point(0, 99);
this.GrpDokumentInhalt.Location = new System.Drawing.Point(0, 102);
this.GrpDokumentInhalt.Name = "GrpDokumentInhalt";
this.GrpDokumentInhalt.Size = new System.Drawing.Size(1633, 254);
this.GrpDokumentInhalt.TabIndex = 1;
this.GrpDokumentInhalt.TabStop = false;
this.GrpDokumentInhalt.Text = "Dokument-Inahalt";
this.GrpDokumentInhalt.Text = "Dokument-Inhalt";
//
// grpFaktura
//
@@ -680,7 +680,7 @@
this.GrpEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
this.GrpEmpfaenger.Location = new System.Drawing.Point(0, 0);
this.GrpEmpfaenger.Name = "GrpEmpfaenger";
this.GrpEmpfaenger.Size = new System.Drawing.Size(902, 602);
this.GrpEmpfaenger.Size = new System.Drawing.Size(902, 599);
this.GrpEmpfaenger.TabIndex = 2;
this.GrpEmpfaenger.TabStop = false;
this.GrpEmpfaenger.Text = "Empfänger";
@@ -695,7 +695,7 @@
this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16);
this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger";
this.sfDataGridEmpfaenger.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended;
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 583);
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 580);
this.sfDataGridEmpfaenger.TabIndex = 4;
this.sfDataGridEmpfaenger.Text = "sfDataGrid1";
this.sfDataGridEmpfaenger.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGridEmpfaenger_CellClick);
@@ -741,7 +741,7 @@
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 583);
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 580);
this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
this.treeViewAdv1.Enabled = false;
@@ -804,7 +804,7 @@
treeNodeAdv3,
treeNodeAdv4});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(230, 583);
this.treeViewAdv1.Size = new System.Drawing.Size(230, 580);
this.treeViewAdv1.TabIndex = 3;
this.treeViewAdv1.Text = "treeViewAdv1";
this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
@@ -866,7 +866,7 @@
this.GridEmpfänger.EditMode = Syncfusion.WinForms.DataGrid.Enums.EditMode.SingleClick;
this.GridEmpfänger.Location = new System.Drawing.Point(3, 16);
this.GridEmpfänger.Name = "GridEmpfänger";
this.GridEmpfänger.Size = new System.Drawing.Size(896, 583);
this.GridEmpfänger.Size = new System.Drawing.Size(896, 580);
this.GridEmpfänger.TabIndex = 2;
this.GridEmpfänger.Text = "sfDataGrid1";
//
@@ -888,7 +888,7 @@
this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon1.OrbVisible = false;
this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon1.Size = new System.Drawing.Size(1633, 99);
this.ribbon1.Size = new System.Drawing.Size(1633, 102);
this.ribbon1.TabIndex = 3;
this.ribbon1.Tabs.Add(this.ribbonTabFunktionen);
this.ribbon1.Tabs.Add(this.ribbonTabPruefung);
@@ -1251,7 +1251,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 353);
this.splitContainer1.Location = new System.Drawing.Point(0, 356);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -1261,7 +1261,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.docPreview1);
this.splitContainer1.Size = new System.Drawing.Size(1633, 602);
this.splitContainer1.Size = new System.Drawing.Size(1633, 599);
this.splitContainer1.SplitterDistance = 902;
this.splitContainer1.TabIndex = 5;
//
@@ -1270,7 +1270,7 @@
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(727, 602);
this.docPreview1.Size = new System.Drawing.Size(727, 599);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
@@ -1278,7 +1278,7 @@
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(114, 58);
this.panelLoad.Location = new System.Drawing.Point(268, 74);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;

2
Client/UIControls/Serienbrief.resx
View File

@@ -127,7 +127,7 @@
<data name="ribbonbuttonsavetemplate.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

6
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -118,7 +118,7 @@
this.GrpPartner.Size = new System.Drawing.Size(540, 235);
this.GrpPartner.TabIndex = 4;
this.GrpPartner.TabStop = false;
this.GrpPartner.Text = "Partner";
this.GrpPartner.Text = "Kunde";
//
// lblAnrede
//
@@ -224,9 +224,9 @@
this.lblPartnerInhaber.AutoSize = true;
this.lblPartnerInhaber.Location = new System.Drawing.Point(80, 25);
this.lblPartnerInhaber.Name = "lblPartnerInhaber";
this.lblPartnerInhaber.Size = new System.Drawing.Size(80, 13);
this.lblPartnerInhaber.Size = new System.Drawing.Size(43, 13);
this.lblPartnerInhaber.TabIndex = 0;
this.lblPartnerInhaber.Text = "Partner-Inhaber";
this.lblPartnerInhaber.Text = "Inhaber";
//
// GrpVerwendung
//

388
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -26,6 +26,8 @@ using Syncfusion.Windows.Forms.Tools.XPMenus;
using Windows.Graphics.Printing3D;
using System.IO;
using System.Net;
using Syncfusion.Windows.Shared;
using System.Xml.Linq;
namespace OnDoc.UIControls
@@ -45,20 +47,20 @@ namespace OnDoc.UIControls
public string check_error { get; set; } = "";
public clsdocgendata docgendata { get; set; }
private bool bpperson_error { get; set; }=false;
private bool bpperson_error { get; set; } = false;
public int bpperson_error_type { get; set; } = 0;
public bool personendokument { get; set; } = false;
public bool bpdokument { get; set; } = false;
public string uniqid { get; set; } = Guid.NewGuid().ToString();
public bool ausDokumentpaket { get; set; } = false;
public bool ausDokumentpaket { get; set; } = false;
public string genertated_dokumentid { get; set; }
public bool ErstellungInOffice = false;
public int vorlagenr = 0;
public bool kopfzeile_generieren = false;
public string barcode_zusatz = "";
public int barcode_top = 0;
public int barcode_left = 0;
public int barcode_width = 0;
@@ -78,7 +80,7 @@ namespace OnDoc.UIControls
{
InitializeComponent();
docgendata = new clsdocgendata();
}
public void Refresh_Details()
@@ -138,16 +140,18 @@ namespace OnDoc.UIControls
this.cbboxunterschriftrechts.Enabled = Convert.ToBoolean(dr["unterschrift_rechts"]) == true;
this.cbformularohneunterschrfit.Enabled = Convert.ToBoolean(dr["unterschrift_ohne"]) == true;
if (cbboxunterschriftlinks.Enabled == false) {
if (cbboxunterschriftlinks.Enabled == false)
{
cbboxunterschriftlinks.Visible = false;
lblUnterschriftlinks.Visible = false;
}
if (cbboxunterschriftrechts.Enabled == false) {
if (cbboxunterschriftrechts.Enabled == false)
{
cbboxunterschriftrechts.Visible = false;
lblUnterschriftrechts.Visible = false;
}
this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
if (this.cbfaksimile.Enabled == true) { this.cbfaksimile.Checked=true; }
if (this.cbfaksimile.Enabled == true) { this.cbfaksimile.Checked = true; }
this.cbformularohneunterschrfit.Checked = false;
if (cbformularohneunterschrfit.Enabled)
@@ -159,19 +163,21 @@ namespace OnDoc.UIControls
cbfaksimile.Visible = false;
lblohneUnterschrift.Visible = true;
}
if (this.cbfaksimile.Enabled==false) { cbfaksimile.Visible=false; }
if (this.cbfaksimile.Enabled == false) { cbfaksimile.Visible = false; }
try {
if (Convert.ToBoolean(dr["ErstellungInOffice"]) == true){
this.ErstellungInOffice = true;
}
else
try
{
ErstellungInOffice = false;
if (Convert.ToBoolean(dr["ErstellungInOffice"]) == true)
{
this.ErstellungInOffice = true;
}
else
{
ErstellungInOffice = false;
}
}
}
catch { ErstellungInOffice=false; }
catch { ErstellungInOffice = false; }
if (dr["Versandstrasse_moeglich"].ToString() == "") { docgendata.versandstrasse_moeglich = false; }
else
@@ -183,13 +189,14 @@ namespace OnDoc.UIControls
try
{
this.rbDokumentbearbeiten.Checked = Convert.ToBoolean(dr["BearbeitungDirket"]) == true;
} catch { this.rbDokumentbearbeiten.Checked = false; }
}
catch { this.rbDokumentbearbeiten.Checked = false; }
try
{
interop = Convert.ToBoolean(dr["interop"]) == true;
}
catch { interop = false; }
barcode = Convert.ToBoolean(dr["Vertrag"])== true;
barcode = Convert.ToBoolean(dr["Vertrag"]) == true;
if (Convert.ToInt32(dr["doktypbedingteretournierung"]) > 0)
{
@@ -212,7 +219,7 @@ namespace OnDoc.UIControls
this.DateTermin.Visible = true;
this.DateTerminText.Visible = true;
this.DateTerminText.Text = "";
}
else
{
@@ -229,7 +236,7 @@ namespace OnDoc.UIControls
barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (barcode_zusatz != "") { barcode_zusatz = " " + barcode_zusatz; }
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent from office_vorlage where office_vorlagenr=" + dr["office_vorlagenr"].ToString(), false, true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
this.kopfzeile_generieren = false;
try
@@ -247,7 +254,7 @@ namespace OnDoc.UIControls
this.barcode_content = db.dsdaten.Tables[0].Rows[0]["DatamatrixContent"].ToString();
string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString();
Logging.Logging.Debug("Barcode-Size Ursprung:" + logdata1,"OnDoc","");
Logging.Logging.Debug("Barcode-Size Ursprung:" + logdata1, "OnDoc", "");
if (this.ErstellungInOffice == false)
@@ -288,16 +295,18 @@ namespace OnDoc.UIControls
ulinks = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"]);
cbboxunterschriftlinks.SelectedValue = ulinks;
}
catch {
ulinks = 0;
Logging.Logging.Debug("Unterschrift links nicht zugewiesen","DokPaket",ulinks.ToString()+" / "+ profilnr.ToString());
catch
{
ulinks = 0;
Logging.Logging.Debug("Unterschrift links nicht zugewiesen", "DokPaket", ulinks.ToString() + " / " + profilnr.ToString());
}
try
{
urechts = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"]);
cbboxunterschriftrechts.SelectedValue = urechts;
}
catch {
catch
{
urechts = 0;
Logging.Logging.Debug("Unterschrift rechts nicht zugewiesen", "DokPaket", urechts.ToString() + " / " + profilnr.ToString());
}
@@ -383,7 +392,7 @@ namespace OnDoc.UIControls
catch { }
//if (e.PropertyName == "Name")
//{
// // Updates the "Last Modified Date"
// this.gridDokwertlist.View.GetPropertyAccessProvider().SetValue(sender as DataRowView, "Last Modified Date", DateTime.Now);
//}
@@ -404,15 +413,16 @@ namespace OnDoc.UIControls
{
DB db1 = new DB(AppParams.connectionstring);
db1.Get_Tabledata("select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true);
if (db1.dsdaten.Tables[0].Rows.Count == 0) {
if (db1.dsdaten.Tables[0].Rows.Count == 0)
{
personendokument = false;
bpdokument = true;
}
else
{
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2") personendokument=true;
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2") personendokument = true;
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "1") personendokument = false;
if (personendokument) { bpdokument=false; }
if (personendokument) { bpdokument = false; }
}
return personendokument;
}
@@ -435,7 +445,7 @@ namespace OnDoc.UIControls
{
bpperson_error = true;
bpperson_error_type = 2;
if(!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
if (!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
@@ -488,7 +498,7 @@ namespace OnDoc.UIControls
db = null;
if (check_bp_person() == true)
{
if (!ausDokumentpaket) Broadcaster().Broadcast("BtnErstellung", new SenderInfo("UIGenDoc", "Enable", uniqid));
if (!ausDokumentpaket) Broadcaster().Broadcast("BtnErstellung", new SenderInfo("UIGenDoc", "Enable", uniqid));
}
else
{
@@ -496,7 +506,7 @@ namespace OnDoc.UIControls
}
}
private void gridDokwertlist_QueryImageCellStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryImageCellStyleEventArgs e)
{
var rowdata = (DataRowView)e.Record;
@@ -514,7 +524,7 @@ namespace OnDoc.UIControls
try
{
if (datenherkunft.ToString().Trim() != "" && datenherkunft.ToString().Trim()!="&Freitext&")
if (datenherkunft.ToString().Trim() != "" && datenherkunft.ToString().Trim() != "&Freitext&")
{
e.Image = (System.Drawing.Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Search.png"));
@@ -529,17 +539,17 @@ namespace OnDoc.UIControls
//e.Image = (Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Search_16x16.png"));
}
private void Refresh_Team(int id=0)
private void Refresh_Team(int id = 0)
{
DB dbteam = new DB(AppParams.connectionstring);
dbteam.clear_parameter();
dbteam.add_parameter("@profilnr", profilnr.ToString());
if (id == 0)
{
dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString());
if (id == 0)
{
dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString());
}
else
else
{
dbteam.add_parameter("@mitarbeiternr", id.ToString());
}
@@ -567,10 +577,11 @@ namespace OnDoc.UIControls
bool zwingend = Convert.ToBoolean(dataRowView.Row["zwingend"]);
var feldwert = dataRowView.Row["feldwert"].ToString().Trim();
var bezeichnung = dataRowView.Row["bezeichnung"];
if (zwingend==true && feldwert=="")
{
if (check_error != "") { check_error=check_error+Environment.NewLine; }
check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend" ; }
if (zwingend == true && feldwert == "")
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend";
}
}
}
if (cbfaksimile.Checked)
@@ -589,28 +600,46 @@ namespace OnDoc.UIControls
}
catch { }
if (cbboxunterschriftlinks.Text == "") { ul = 0; }
if (cbboxunterschriftlinks.Text == "") { ul = 0; }
if (cbboxunterschriftrechts.Text == "") { ur = 0; }
if (cbfaksimile.Checked) {
if (ul != 0)
if (cbfaksimile.Checked)
{
if (!Check_Signature(ul))
if (ul != 0)
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild "+cbboxunterschriftlinks.Text + " fehlt";
if (!Check_Signature(ul))
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild " + cbboxunterschriftlinks.Text + " fehlt";
}
}
if (ur != 0)
{
if (!Check_Signature(ur))
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild " + cbboxunterschriftrechts.Text + " fehlt";
}
}
}
if (ur != 0)
}
try
{
if (!Check_Signature(ur))
if (this.DateTerminText.Text.Trim() != "")
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Unterschriftenbild " + cbboxunterschriftrechts.Text + " fehlt";
try
{
DateTime checkdate = Convert.ToDateTime(this.DateTerminText.Text);
}
catch
{
if (check_error != "") { check_error = check_error + Environment.NewLine; }
check_error = check_error + "- Termin-Datum ist kein gültiges Datum ";
}
}
}
}
catch { }
//20250121 - ausblenden
//if (ul==0 || ur == 0)
@@ -619,12 +648,9 @@ namespace OnDoc.UIControls
// check_error = check_error + "- " + "Bitte Unterschrift links und rechts auswählen";
//}
}
if (check_error == "") { return true; } else { return false; }
return true;
}
@@ -665,7 +691,7 @@ namespace OnDoc.UIControls
return false;
}
}
catch
catch
{
return false;
}
@@ -674,7 +700,7 @@ namespace OnDoc.UIControls
}
public void Update_DocGenData()
{
docgendata.partnernr = this.partnernr.ToString();
docgendata.inhaberadresse = this.txtPartnerInhaber.Text;
docgendata.zustelladresse = this.txtPartnerZusteller.Text;
@@ -713,11 +739,11 @@ namespace OnDoc.UIControls
if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
}
public void update_dokdata(ref clsDocData dokdata)
@@ -728,9 +754,10 @@ namespace OnDoc.UIControls
try
{
dokdata.postzustellung = cbboxpostzustellung.SelectedValue.ToString();
} catch { dokdata.postzustellung = "0"; }
}
catch { dokdata.postzustellung = "0"; }
dokdata.DokumenttypNr = docgendata.dokumenttypnr;
dokdata.Unterschrift_Links = docgendata.unterschriftLinks;
@@ -745,7 +772,7 @@ namespace OnDoc.UIControls
dokdata.Bezeichnung = docgendata.bezeichnung;
if (docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = "False"; }
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
if (docgendata.frormularOhneUnterschrift==true) { dokdata.Form_ohne_Unterschrift = "True" ; } else { dokdata.Form_ohne_Unterschrift = "False"; }
if (docgendata.frormularOhneUnterschrift == true) { dokdata.Form_ohne_Unterschrift = "True"; } else { dokdata.Form_ohne_Unterschrift = "False"; }
dokdata.Zustaendig_Kube = "0";
if (this.rbzustaendigkube.Checked)
@@ -765,14 +792,14 @@ namespace OnDoc.UIControls
dokdata.barcode_font = AppParams.barcodefont;
dokdata.barcode_fontsize = Convert.ToInt32(AppParams.barcodefontsize);
dokdata.Zusatz_Font = AppParams.ZusatzFont;
dokdata.Zusatz_FontSize = Convert.ToInt32(AppParams.ZusatzFontSize);
dokdata.Zusatz_FontSize = Convert.ToInt32(AppParams.ZusatzFontSize);
dokdata.barcode_textposition = AppParams.barcodetextposition;
dokdata.barcode_type = barcode_type;
dokdata.barcode_content = barcode_content;
dokdata.Erstellung_in_Office = this.Erstellung_in_Office;
dokdata.FillOffice = this.FillOffice;
dokdata.CompatibilityMode= this.CompatibilityMode;
if (dokdata.Barcode==false && this.bedingt_retournierbar==true) { dokdata.Barcode = true; }
dokdata.CompatibilityMode = this.CompatibilityMode;
if (dokdata.Barcode == false && this.bedingt_retournierbar == true) { dokdata.Barcode = true; }
if (DateTerminText.Text == "")
{
@@ -780,12 +807,13 @@ namespace OnDoc.UIControls
}
else
{
dokdata.Termin = DateTermin.Value.ToString();
dokdata.Termin = DateTerminText.Text;
//.ToString DateTermin.Value.ToString();
}
dokdata.Bezeichnung = txtbezeichnung.Text.ToString();
dokdata.zustelladresse = docgendata.zustelladresse;
dokdata.anrede = docgendata.anrede;
dokdata.barcode_zusatz = barcode_zusatz;
if (cbfaksimile.Checked)
@@ -800,7 +828,7 @@ namespace OnDoc.UIControls
{
if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftlinks.SelectedValue.ToString()))
{
dokdata.approval1 = 1;
dokdata.approval1 = 1;
}
}
}
@@ -817,7 +845,7 @@ namespace OnDoc.UIControls
}
}
catch { }
if (dokdata.approval1 == 1 && dokdata.approval2 == 1 )
if (dokdata.approval1 == 1 && dokdata.approval2 == 1)
{
dokdata.approved = 1;
dokdata.signiert = false;
@@ -835,7 +863,7 @@ namespace OnDoc.UIControls
private void show_partnerdialog()
{
Partnersuche ps = new Partnersuche(personendokument,true,bpdokument,dokumenttypnr);
Partnersuche ps = new Partnersuche(personendokument, true, bpdokument, dokumenttypnr);
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
@@ -872,108 +900,110 @@ namespace OnDoc.UIControls
private string data_select(string datenherkunft, string feldtyp)
{
try {
if (datenherkunft=="" || datenherkunft=="&Freitext&") { return ""; }
switch (feldtyp.ToUpper())
try
{
case "DATUMSHORT":
if (datenherkunft == "" || datenherkunft == "&Freitext&") { return ""; }
switch (feldtyp.ToUpper())
{
case "DATUMSHORT":
case "DATUMMEDIUM":
case "DATUMLONG":
valueselector f = new valueselector(true);
f.ShowDialog();
string res = "";
if (f.DialogResult == DialogResult.OK)
{
case "DATUMMEDIUM":
case "DATUMLONG":
if (feldtyp.ToUpper() == "DATUMSHORT")
valueselector f = new valueselector(true);
f.ShowDialog();
string res = "";
if (f.DialogResult == DialogResult.OK)
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datumshort);
}
if (feldtyp.ToUpper() == "DATUMMEDIUM")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
if (feldtyp.ToUpper() == "DATUMLONG")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
}
f.Dispose();
return res;
break;
case "TEXT":
if (datenherkunft.Substring(0, 1) != "&") { return ""; }
if (datenherkunft.Length >= 8 && datenherkunft.Substring(0, 8).ToUpper() == "&PARTNER")
{
Partnersuche p = new Partnersuche();
p.ShowDialog();
if (p.partnernr != 0) { return p.partnernr.ToString() + " - " + p.partnerkurzname; } else { return ""; }
}
valueselector vs = new valueselector();
if (datenherkunft.ToUpper() == "&SekPartnerVV&")
{
var records = gridDokwertlist.View.Records;
string s = "";
foreach (var record in records)
{
var dataRowView = record.Data as DataRowView;
if (dataRowView != null)
if (feldtyp.ToUpper() == "DATUMSHORT")
{
var selectedValue = dataRowView.Row["datenherkunft"];
if (selectedValue== "&Partner&")
{
s = "";
s = dataRowView.Row["feldwert"].ToString();
int ii = 0;
ii = s.IndexOf("-") - 1;
if (ii < 1) return "";
}
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datumshort);
}
if (feldtyp.ToUpper() == "DATUMMEDIUM")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
if (feldtyp.ToUpper() == "DATUMLONG")
{
res = Helper.ConvertHelper.Datum(Convert.ToDateTime(f.selected_datetime), Helper.ConvertHelper.DateTimeFormat.datummedium);
}
}
vs.partnernr = s.Substring(0, s.IndexOf("-") - 1);
}
if (datenherkunft.ToUpper() == "&TerPartnerVV&")
{
var records = gridDokwertlist.View.Records;
string s = "";
foreach (var record in records)
f.Dispose();
return res;
break;
case "TEXT":
if (datenherkunft.Substring(0, 1) != "&") { return ""; }
if (datenherkunft.Length >= 8 && datenherkunft.Substring(0, 8).ToUpper() == "&PARTNER")
{
var dataRowView = record.Data as DataRowView;
if (dataRowView != null)
Partnersuche p = new Partnersuche();
p.ShowDialog();
if (p.partnernr != 0) { return p.partnernr.ToString() + " - " + p.partnerkurzname; } else { return ""; }
}
valueselector vs = new valueselector();
if (datenherkunft.ToUpper() == "&SekPartnerVV&")
{
var records = gridDokwertlist.View.Records;
string s = "";
foreach (var record in records)
{
var selectedValue = dataRowView.Row["datenherkunft"];
if (selectedValue == "&Partner3&")
var dataRowView = record.Data as DataRowView;
if (dataRowView != null)
{
s = "";
s = dataRowView.Row["feldwert"].ToString();
int ii = 0;
ii = s.IndexOf("-") - 1;
if (ii < 1) return "";
var selectedValue = dataRowView.Row["datenherkunft"];
if (selectedValue == "&Partner&")
{
s = "";
s = dataRowView.Row["feldwert"].ToString();
int ii = 0;
ii = s.IndexOf("-") - 1;
if (ii < 1) return "";
}
}
}
vs.partnernr = s.Substring(0, s.IndexOf("-") - 1);
}
vs.partnernr = s.Substring(0, s.IndexOf("-") - 1);
if (datenherkunft.ToUpper() == "&TerPartnerVV&")
{
var records = gridDokwertlist.View.Records;
string s = "";
foreach (var record in records)
{
var dataRowView = record.Data as DataRowView;
if (dataRowView != null)
{
var selectedValue = dataRowView.Row["datenherkunft"];
if (selectedValue == "&Partner3&")
{
s = "";
s = dataRowView.Row["feldwert"].ToString();
int ii = 0;
ii = s.IndexOf("-") - 1;
if (ii < 1) return "";
}
}
}
vs.partnernr = s.Substring(0, s.IndexOf("-") - 1);
vs.load_data();
vs.ShowDialog();
}
vs.datenherkunft = datenherkunft;
vs.partnernr = this.partnernr.ToString();
vs.load_data();
vs.ShowDialog();
}
vs.datenherkunft = datenherkunft;
vs.partnernr = this.partnernr.ToString();
vs.load_data();
vs.ShowDialog();
if (vs.DialogResult == DialogResult.OK) {
return vs.selected_value;
}
if (vs.DialogResult == DialogResult.OK)
{
return vs.selected_value;
}
break;
default:
return "";
break;
}
return "";
break;
default:
return "";
break;
}
return "";
}
catch { return ""; }
@@ -991,7 +1021,7 @@ namespace OnDoc.UIControls
{
btnErneutGenerierung.Visible = true;
}
private void rbzustaendigkube_CheckedChanged(object sender, EventArgs e)
{
@@ -1002,7 +1032,8 @@ namespace OnDoc.UIControls
{
PartnerDetails pd = new PartnerDetails(this.partnernr, true);
pd.ShowDialog();
if (pd.DialogResult == DialogResult.OK) {
if (pd.DialogResult == DialogResult.OK)
{
this.txtPartnerZusteller.Text = pd.selectedadresse;
this.txtanrede.Text = pd.selectedanrede;
@@ -1011,7 +1042,7 @@ namespace OnDoc.UIControls
private void btneditadresse_Click(object sender, EventArgs e)
{
InputDialog id = new InputDialog("Zustelladresse", "Zustelladresse ändern", this.txtPartnerZusteller.Text,true);
InputDialog id = new InputDialog("Zustelladresse", "Zustelladresse ändern", this.txtPartnerZusteller.Text, true);
id.ShowDialog();
if (id.DialogResult == DialogResult.OK)
{
@@ -1063,12 +1094,12 @@ namespace OnDoc.UIControls
private void DateTermin_ValueChanged(object sender, Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventArgs e)
{
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0, 10);
}
private void gridDokwertlist_DoubleClick(object sender, EventArgs e)
{
}
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -1094,21 +1125,22 @@ namespace OnDoc.UIControls
public void load_doc()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + this.dokumentid+"'", false, true);
db.Get_Tabledata("Select * from dokument where dokumentid='" + this.dokumentid + "'", false, true);
System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0];
this.partnernr = Convert.ToInt32(dr["nrpar00"]);
this.dokumenttypnr = Convert.ToInt32(dr["dokumenttypnr"]);
Refresh_Details();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.cbboxunterschriftlinks.SelectedValue= Convert.ToInt32(dr["unterschriftlinks"]);
this.cbboxunterschriftlinks.SelectedValue = Convert.ToInt32(dr["unterschriftlinks"]);
this.cbboxunterschriftrechts.SelectedValue = Convert.ToInt32(dr["unterschriftrechts"]);
if (Convert.ToInt32(dr["zustaendig_kube"]) > 0)
{
rbzustaendigkube.Checked = true;
rbzustaendigmitarbeiter.Checked = false;
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendiger"]);
} else
}
else
{
rbzustaendigmitarbeiter.Checked = true;
rbzustaendigkube.Checked = false;
@@ -1119,10 +1151,20 @@ namespace OnDoc.UIControls
this.txtanrede.Text = dr["anredezustelladresse"].ToString();
this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]);
this.DateDokumentDatum.Value = Convert.ToDateTime(dr["erstellungsdatum"]);
this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString();
if (Convert.ToDateTime(dr["termin"]).Year < 2000)
{
this.DateTerminText.Text = "";
}
else
{
this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString();
this.DateTerminText.Text = this.DateTerminText.Text.Substring(0, 10);
}
this.signiert = Convert.ToBoolean(dr["signiert"]) == true;
this.cbfaksimile.Checked = Convert.ToBoolean(dr["faksimile"])==true;
this.cbfaksimile.Checked = Convert.ToBoolean(dr["faksimile"]) == true;
if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString();
Get_DokWertList(ref db, dokumentid, 0);
@@ -1132,6 +1174,6 @@ namespace OnDoc.UIControls
}
}
}

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
Client/bin/Debug/_Zipit.bat
View File

@@ -1,5 +1,5 @@
delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll WinSign.dll BarcodeLibVBDatamatrix.dll, vboffice.dll
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll WinSign.dll vboffice.dll
copy OnDocClient.zip H:\NextCloud\ZZDownload
pause

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

Binary file not shown.

BIN
Client/bin/Release/BarcodeLib.dll
View File

Binary file not shown.

BIN
Client/bin/Release/BarcodeLib.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/DOCGEN.dll
View File

Binary file not shown.

BIN
Client/bin/Release/DOCGEN.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Release/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/Model.dll
View File

Binary file not shown.

BIN
Client/bin/Release/Model.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/OfficePrinter.dll
View File

Binary file not shown.

BIN
Client/bin/Release/OfficePrinter.pdb
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/Release/OnDocClient_Released.zip Normal file
View File

Binary file not shown.

BIN
Client/bin/Release/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Release/OnDocOffice.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/VBFileManagement.dll
View File

Binary file not shown.

BIN
Client/bin/Release/VBFileManagement.pdb
View File

Binary file not shown.

BIN
Client/bin/Release/VBOffice.dll Normal file
View File

Binary file not shown.

BIN
Client/bin/Release/VBOffice.pdb Normal file
View File

Binary file not shown.

26
Client/bin/Release/VBOffice.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBOffice
</name>
</assembly>
<members>
<member name="T:VBOffice.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

BIN
Client/bin/Release/WinSign.dll Normal file
View File

Binary file not shown.

BIN
Client/bin/Release/WinSign.pdb Normal file
View File

Binary file not shown.

4
Client/bin/Release/_Zipit.bat
View File

@@ -1,5 +1,5 @@
delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient_Released.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll WinSign.dll vboffice.dll
copy OnDocClient.zip H:\NextCloud\ZZDownload
copy OnDocClient_Released.zip H:\NextCloud\ZZDownload
pause

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

Binary file not shown.

BIN
Client/bin/Release/vbBarcodes.dll
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More