diff --git a/API_NetFramework/API_NetFramework.csproj.user b/API_NetFramework/API_NetFramework.csproj.user index 49c01a40..aab579a4 100644 --- a/API_NetFramework/API_NetFramework.csproj.user +++ b/API_NetFramework/API_NetFramework.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ApiControllerEmptyScaffolder root/Common 600 diff --git a/API_NetFramework/Controllers/AntwortAdressController.cs b/API_NetFramework/Controllers/AntwortAdressController.cs index dc7b9c2a..3c912eb9 100644 --- a/API_NetFramework/Controllers/AntwortAdressController.cs +++ b/API_NetFramework/Controllers/AntwortAdressController.cs @@ -37,11 +37,15 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAll", LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); string SQL = "Select * from Antwortadresse order by bezeichnung"; if (OutFormat == "JSON") { SQL = SQL + " for json path"; } if (OutFormat == "XML") { SQL = SQL + " for xml path"; } db.Get_Tabledata(SQL, false, true); + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAll", LogLevelType.Debug); + return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); } catch (Exception e) @@ -69,12 +73,22 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetByID ID:"+ID, LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); string SQL = "Select * from Antwortadresse where id=" + ID; if (OutFormat == "JSON") { SQL = SQL + " for json path"; } if (OutFormat == "XML") { SQL = SQL + " for xml path"; } db.Get_Tabledata(SQL, false, true); - if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); }; + if (db.dsdaten.Tables[0].Rows.Count == 0) { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetByID ID:" + ID, LogLevelType.Debug); + + return Ok(); + } else { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetByID ID:" + ID, LogLevelType.Debug); + + return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); + }; } catch (Exception e) { @@ -101,12 +115,22 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); string SQL = "Select * from AntwortAdresse_Mitarbeiter where aktiv=1 and tgnummer='" + tgnummer + "' order by bezeichnung "; if (OutFormat == "JSON") { SQL = SQL + " for json path"; } if (OutFormat == "XML") { SQL = SQL + " for xml path"; } db.Get_Tabledata(SQL, false, true); - if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); }; + if (db.dsdaten.Tables[0].Rows.Count == 0) { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug); + + return Ok(); + } else { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug); + + return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); + }; } catch (Exception e) { @@ -132,12 +156,20 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:"+Mitarbeiternr, LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); string SQL = "Select * from AntwortAdresse_Mitarbeiter where aktiv=1 and Mitarbeiternr='" + Mitarbeiternr + "' "; if (OutFormat == "JSON") { SQL = SQL + " for json path"; } if (OutFormat == "XML") { SQL = SQL + " for xml path"; } db.Get_Tabledata(SQL, false, true); - if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); }; + if (db.dsdaten.Tables[0].Rows.Count == 0) { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:" + Mitarbeiternr, LogLevelType.Debug); + return Ok(); + } else { + APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:" + Mitarbeiternr, LogLevelType.Debug); + return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); + }; } catch (Exception e) { @@ -166,12 +198,19 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetMitarbeiterByID ID: "+ID, LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); string SQL = "Select * from AntwortAdresse_Mitarbeiter where id=" + ID; if (OutFormat == "JSON") { SQL = SQL + " for json path"; } if (OutFormat == "XML") { SQL = SQL + " for xml path"; } db.Get_Tabledata(SQL, false, true); - if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); }; + if (db.dsdaten.Tables[0].Rows.Count == 0) { + APILogging.Log((HttpRequestMessage)Request, "Ende GetMitarbeiterByID ID: " + ID, LogLevelType.Debug); + return Ok(); + } else { + APILogging.Log((HttpRequestMessage)Request, "Ende GetMitarbeiterByID ID: " + ID, LogLevelType.Debug); + return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); }; } catch (Exception e) { @@ -197,6 +236,8 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug); + Database.DB db = new Database.DB(connectionstring); db.clear_parameter(); db.add_parameter("@tgnummer", TGNummer); @@ -204,10 +245,12 @@ namespace API_NetFramework.Controllers db.Get_Tabledata("sp_get_gas_einzeilig", true, false); if (db.dsdaten.Tables[0].Rows.Count == 0) { + APILogging.Log((HttpRequestMessage)Request, "Ende GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug); return Content(HttpStatusCode.NotFound, ""); } else { + APILogging.Log((HttpRequestMessage)Request, "Ende GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug); return Content(HttpStatusCode.OK, db.dsdaten.Tables[0].Rows[0][0].ToString()); }; } diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index f93f8a13..b1760e4d 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -49,6 +49,8 @@ namespace API_NetFramework.Controllers private void Update_IL_Log(ref ILResponse ilr, string dokumentid) { + APILogging.Log((HttpRequestMessage)Request, "Start Updaet IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug); + DB dB = new DB(ConfigurationManager.ConnectionStrings["JournalConnectionstring"].ConnectionString); string sql = "Insert OnDoc_IL_Log (dokumentid, ilresponse,error, erstellt_am) values ('" + dokumentid + "',"; sql = sql + "'" + ilr.response.ToString() + "',"; @@ -56,6 +58,7 @@ namespace API_NetFramework.Controllers sql = sql + "'" + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") + "')"; dB.Exec_SQL(sql); dB = null; + APILogging.Log((HttpRequestMessage)Request, "Ende Updaet IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug); } private void update_dokumentstatus(string dokumentid) @@ -85,6 +88,7 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start ArchiveDocFromDatabase: DokumentID:"+DokumentID, LogLevelType.Debug); DB db = new DB(connectionstring); db.clear_parameter(); db.add_parameter("@dokumentid", DokumentID); @@ -128,7 +132,6 @@ namespace API_NetFramework.Controllers string SendToFile = System.Configuration.ConfigurationManager.AppSettings["SendToFile"]; string debugdir = System.Configuration.ConfigurationManager.AppSettings["DebugDir"]; string jsonstring = Newtonsoft.Json.JsonConvert.SerializeObject(onbasedoc); - IHttpActionResult transferResult = null; if (SendToOnBase != "Yes") { @@ -139,9 +142,14 @@ namespace API_NetFramework.Controllers { debugfilename = debugfilename + DokumentID + ".json"; System.IO.File.WriteAllText(debugfilename, jsonstring); + debugfilename = debugfilename + ".pdf"; + Helper.clsFileHelper fh = new Helper.clsFileHelper(); + fh.SaveBase64ToFile(onbasedoc.dokumentDatei, debugfilename); + fh = null; } } } + APILogging.Log((HttpRequestMessage)Request, "Ende ArchiveDocFromDatabase: DokumentID:" + DokumentID, LogLevelType.Debug); //Log nachführen Update_IL_Log(ref ilr,DokumentID); @@ -166,36 +174,36 @@ namespace API_NetFramework.Controllers } - [HttpGet] - [Route("API/ArchiveDocBase64")] - /// - /// Archiviert das als Base64String übergebene Dokument in OnBase - /// - /// - /// - /// - /// Returncode: 200 (OK) - /// Dokumenthandle aus OnBase - /// - /// - // - public IHttpActionResult ArchivDocBase64(string DokumentID, string Dokumenttyp) - { - if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false) - { - return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key"); - } - try - { + //[HttpGet] + //[Route("API/ArchiveDocBase64")] + ///// + ///// Archiviert das als Base64String übergebene Dokument in OnBase + ///// + ///// + ///// + ///// + ///// Returncode: 200 (OK) + ///// Dokumenthandle aus OnBase + ///// + ///// + //// + //public IHttpActionResult ArchivDocBase64(string DokumentID, string Dokumenttyp) + //{ + // if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false) + // { + // return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key"); + // } + // try + // { - return Ok(); - } - catch (Exception e) - { - APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error); - return Content(HttpStatusCode.InternalServerError, e.Message); - } - } + // return Ok(); + // } + // catch (Exception e) + // { + // APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error); + // return Content(HttpStatusCode.InternalServerError, e.Message); + // } + //} /// /// CheckDocID prüft auf eine vorhandene DokumentID in OnDoc (DokumentID OFFEDK... / Barcode-Klenber-Nr) /// @@ -215,6 +223,7 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug); Database.DB db = new Database.DB(connectionstring); db.Get_Tabledata("Select * from dokument where dokumentid = '" + DokumentID + "'", false, true); if (db.dsdaten.Tables[0].Rows.Count > 0) @@ -226,6 +235,8 @@ namespace API_NetFramework.Controllers { return Ok(DokumentID); } + APILogging.Log((HttpRequestMessage)Request, "Ende Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug); + return Content(HttpStatusCode.NotFound, DokumentID); } catch (Exception e) @@ -248,6 +259,7 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug); if (dokumentid.Substring(0, 6).ToUpper() == "ONDOC00") { return (ArchivDocFromDatabase(dokumentid)); @@ -265,7 +277,7 @@ namespace API_NetFramework.Controllers //return Content(HttpStatusCode.OK, ""); - APILogging.Log((HttpRequestMessage)Request, dokumentid+" Archivierung ausgelöst", LogLevelType.Info); + APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug); return Ok(dokumentid); } catch (Exception e) @@ -277,12 +289,14 @@ namespace API_NetFramework.Controllers [HttpPost] [Route("API/ArchivSBDoc")] - public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr ) + public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr, string dokumentid ) { if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false) { return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key"); } + APILogging.Log((HttpRequestMessage)Request, "Start ArchivSBDoc DokumentID: DokumentID:" + dokumentid, LogLevelType.Debug); + string json = ""; if (HttpContext.Current.Request.InputStream.Length > 0) { @@ -316,6 +330,7 @@ namespace API_NetFramework.Controllers //Log nachführen Update_IL_Log(ref ilr, "SB_" + sbnr.ToString() + "_" + intid.ToString()); + APILogging.Log((HttpRequestMessage)Request, "Ende ArchivSBDoc DokumentID: DokumentID:" + dokumentid, LogLevelType.Debug); return transferResult; //return Content(HttpStatusCode.OK, ""); } @@ -325,8 +340,9 @@ namespace API_NetFramework.Controllers //ILResponse ilr = new ILResponse(); string response; WebRequest request; + APILogging.Log((HttpRequestMessage)Request, "Start Transfer to OnBase", LogLevelType.Debug); - string url=""; + string url =""; switch (utype){ case uploadtype.fast: url= System.Configuration.ConfigurationManager.AppSettings["ILFast"]; @@ -362,6 +378,7 @@ namespace API_NetFramework.Controllers ilr.StatusCode = 0; ilr.senderror = 0; ilr.response=response; + APILogging.Log((HttpRequestMessage)Request, "Ende Transfer to OnBase", LogLevelType.Debug); return Content(HttpStatusCode.OK, ilr); } catch (Exception ex) diff --git a/API_NetFramework/Controllers/DocumentController.cs b/API_NetFramework/Controllers/DocumentController.cs index f0318797..579db07d 100644 --- a/API_NetFramework/Controllers/DocumentController.cs +++ b/API_NetFramework/Controllers/DocumentController.cs @@ -35,9 +35,13 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetDocument DokumentID:"+dokid, LogLevelType.Debug); + DOCGEN.DocGet gd = new DocGet(connectionstring); clsdok dok = new clsdok("", "", ""); dok = gd.GetDoc(dokid); + APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); + return Ok(dok); } catch (Exception e) @@ -69,11 +73,15 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetDocumentPDF DokumentID:" + dokid, LogLevelType.Debug); + DOCGEN.DocGet gd = new DocGet(connectionstring); clsdok dok = new clsdok("", "", ""); dok = gd.GetDocAsPDF(dokid); dok.extension = "pdf"; dok.doktype = "P"; + APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); + return Ok(dok); } catch (Exception e) @@ -94,11 +102,14 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start SendToOnBase:" + dokid, LogLevelType.Debug); + DB db = new DB(connectionstring); db.Get_Tabledata("Select * from dokument where dokumentid='" + dokid + "'", false, true); if (db.dsdaten.Tables[0].Rows.Count < 1) { db = null; + APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); return BadRequest("Dokument " + dokid + " not found"); } else @@ -110,6 +121,8 @@ namespace API_NetFramework.Controllers db.Exec_SQL("Update dokument set loeschgrund='Archiviert' where dokumentid='" + dokid + "'"); db = null; + APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug); + return Ok("Archivierung ausgelöst"); } } @@ -131,6 +144,8 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GenDoc " , LogLevelType.Debug); + if (!(ParamCheck("partnernr", Partnernr))) { return BadRequest("Partnernr " + Partnernr + " ist ungültig"); } if (!(ParamCheck("dokumenttyp", Dokumenttypnr))) { return BadRequest("Dokumenttyp " + Dokumenttypnr + " ist ungültig"); } if (!(ParamCheck("tgcreator", TGCreator))) { return BadRequest("TGCreator " + TGCreator + " ist ungültig"); } @@ -189,6 +204,8 @@ namespace API_NetFramework.Controllers clsdok dok = new clsdok("", "", ""); dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); db.Save_To_DB(dokumentid, "", dok.dokument); + APILogging.Log((HttpRequestMessage)Request, "Ende GenDoc DokumentID:"+dokumentid, LogLevelType.Debug); + return Ok(dokumentid); } catch (Exception e) diff --git a/API_NetFramework/Controllers/UnterschriftController.cs b/API_NetFramework/Controllers/UnterschriftController.cs index 3e23e8af..17f4d9b8 100644 --- a/API_NetFramework/Controllers/UnterschriftController.cs +++ b/API_NetFramework/Controllers/UnterschriftController.cs @@ -47,6 +47,7 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetUnterschriftAsBase64 TGNummer: " + TGNummer, LogLevelType.Debug); string path = System.Configuration.ConfigurationManager.AppSettings["UnterschriftPath"]; string filename = path + TGNummer + ".pdf"; if (!File.Exists(filename)) @@ -86,6 +87,7 @@ namespace API_NetFramework.Controllers } try { + APILogging.Log((HttpRequestMessage)Request, "Start GetUnterschrift TGNummer: " + TGNummer, LogLevelType.Debug); string path = System.Configuration.ConfigurationManager.AppSettings["UnterschriftPath"]; string filename = path + TGNummer + ".jpg"; if (!File.Exists(filename)) @@ -98,6 +100,8 @@ namespace API_NetFramework.Controllers byte[] b = File.ReadAllBytes(filename); var dataStream = new MemoryStream(b); string imageName = TGNummer + ".jpg"; + APILogging.Log((HttpRequestMessage)Request, "Ende GetUnterschrift TGNummer: " + TGNummer, LogLevelType.Debug); + return new unterschriftResult(dataStream, Request, imageName); } catch (Exception e) diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 78577fbe..2a5bfd1a 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2024-11-11T12:42:23.6578245Z||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; + True|2024-11-13T16:47:13.0183160Z||;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||; @@ -82,16 +82,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/09/2024 19:25:14 - 11/11/2024 09:13:16 + 11/13/2024 07:13:56 - 11/11/2024 09:13:16 + 11/13/2024 07:13:56 - 11/11/2024 13:42:22 + 11/13/2024 17:46:34 - 11/11/2024 13:42:22 + 11/13/2024 17:46:34 10/20/2023 22:35:02 @@ -124,13 +124,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 11/11/2024 13:42:22 + 11/13/2024 17:46:34 08/30/2024 10:27:25 - 11/11/2024 13:42:22 + 11/13/2024 17:46:34 11/27/2023 09:49:58 @@ -208,10 +208,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/11/2022 19:09:46 - 11/09/2024 11:54:46 + 11/13/2024 17:46:34 - 11/09/2024 11:54:46 + 11/13/2024 17:46:34 11/28/2018 00:10:18 @@ -235,10 +235,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/10/2024 07:00:48 - 11/11/2024 13:42:23 + 11/13/2024 17:47:11 - 11/11/2024 13:42:23 + 11/13/2024 17:47:11 11/13/2012 13:19:34 @@ -616,7 +616,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 06/03/2024 08:11:55 - 11/11/2024 13:42:23 + 11/13/2024 17:46:35 \ No newline at end of file diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config index 4b1ee6b3..706c76ff 100644 --- a/API_NetFramework/Web.config +++ b/API_NetFramework/Web.config @@ -12,10 +12,13 @@ - + + - + diff --git a/API_NetFramework/auth.cs b/API_NetFramework/auth.cs index 59a4f710..ea524931 100644 --- a/API_NetFramework/auth.cs +++ b/API_NetFramework/auth.cs @@ -132,6 +132,10 @@ namespace SecuringWebApiUsingApiKey.Middleware if (GetValue("AuthCheck") == "Yes") { apikeys = GetValue("APIKeys").ToString().Split(','); + for (int i = 0; i < apikeys.Length; i++) + { + apikeys[i] = apikeys[i].Replace(Environment.NewLine, ""); + } IEnumerable> queryParams = request.GetQueryNameValuePairs(); var key = queryParams.FirstOrDefault(x => x.Key == "api_key"); if (apikeys.Contains(key.Value) && checkfunction(key.Value,function)==true) { return true; } diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index bd7be8e4..2bf69b2b 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index 2aa1a24a..9029404b 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 5f35b952..5c8d7e17 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index 07058233..e7bac381 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/Helper.dll b/API_NetFramework/bin/Helper.dll index 26b96769..a5c09067 100644 Binary files a/API_NetFramework/bin/Helper.dll and b/API_NetFramework/bin/Helper.dll differ diff --git a/API_NetFramework/bin/Helper.pdb b/API_NetFramework/bin/Helper.pdb index c67ed204..8e6e3523 100644 Binary files a/API_NetFramework/bin/Helper.pdb and b/API_NetFramework/bin/Helper.pdb differ diff --git a/API_NetFramework/bin/Logging.dll b/API_NetFramework/bin/Logging.dll index 52e70b41..bb31fe4e 100644 Binary files a/API_NetFramework/bin/Logging.dll and b/API_NetFramework/bin/Logging.dll differ diff --git a/API_NetFramework/bin/Logging.pdb b/API_NetFramework/bin/Logging.pdb index e837a9d7..2e8b02d0 100644 Binary files a/API_NetFramework/bin/Logging.pdb and b/API_NetFramework/bin/Logging.pdb differ diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index c93b0ee9..8d1bb622 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index fe3263e2..92cd7919 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index ed429271..a431ae66 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll.config b/API_NetFramework/bin/OnDoc_NetFramework.dll.config index 4b1ee6b3..706c76ff 100644 --- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config +++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config @@ -12,10 +12,13 @@ - + + - + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 689aa1b9..d67f7deb 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 2f796bfb..6023881b 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -63,3 +63,51 @@ 2024-11-11 09:31:56.0854|DEBUG|OnDoc| 2024-11-11 09:32:01.0609|DEBUG|OnDoc| 2024-11-11 09:32:01.2475|DEBUG|OnDoc| +2024-11-12 15:08:10.3508|DEBUG|OnDoc| +2024-11-12 15:08:36.8714|DEBUG|OnDoc| +2024-11-12 15:08:36.9080|DEBUG|OnDoc| +2024-11-12 15:08:41.2455|DEBUG|OnDoc| +2024-11-12 15:08:45.7162|DEBUG|OnDoc| +2024-11-12 15:09:21.6197|DEBUG|OnDoc| +2024-11-12 15:09:35.3950|DEBUG|OnDoc| +2024-11-12 15:09:35.4390|DEBUG|OnDoc| +2024-11-12 15:09:40.6197|DEBUG|OnDoc| +2024-11-12 15:09:40.6769|DEBUG|OnDoc| +2024-11-12 15:14:03.8528|DEBUG|OnDoc| +2024-11-12 15:14:25.5539|DEBUG|OnDoc| +2024-11-12 15:14:25.6059|DEBUG|OnDoc| +2024-11-12 15:14:31.8184|DEBUG|OnDoc| +2024-11-12 15:14:31.8347|DEBUG|OnDoc| +2024-11-12 15:15:56.5269|DEBUG|OnDoc| +2024-11-12 15:15:56.5804|DEBUG|OnDoc| +2024-11-12 15:16:03.5964|DEBUG|OnDoc| +2024-11-12 15:16:03.6265|DEBUG|OnDoc| +2024-11-12 15:16:03.6490|DEBUG|OnDoc| +2024-11-12 15:16:03.6606|DEBUG|OnDoc| +2024-11-12 15:16:26.5044|DEBUG|OnDoc| +2024-11-12 15:16:26.5834|DEBUG|OnDoc| +2024-11-12 15:17:05.9655|DEBUG|OnDoc| +2024-11-12 15:17:22.5681|DEBUG|OnDoc| +2024-11-12 15:17:30.6552|DEBUG|OnDoc| +2024-11-12 15:17:38.8445|DEBUG|OnDoc| +2024-11-12 15:17:42.7437|DEBUG|OnDoc| +2024-11-12 19:27:44.4569|DEBUG|OnDoc| +2024-11-12 19:27:44.5229|DEBUG|OnDoc| +2024-11-12 19:28:15.5873|DEBUG|OnDoc| +2024-11-12 19:28:15.6013|DEBUG|OnDoc| +2024-11-12 19:28:15.6503|DEBUG|OnDoc| +2024-11-12 19:28:15.6663|DEBUG|OnDoc| +2024-11-12 19:28:18.2256|DEBUG|OnDoc| +2024-11-12 19:28:18.2396|DEBUG|OnDoc| +2024-11-13 13:40:02.8689|DEBUG|OnDoc| +2024-11-13 13:41:08.9490|DEBUG|OnDoc| +2024-11-13 13:41:50.5517|DEBUG|OnDoc| +2024-11-13 17:42:12.7810|ERROR|OnDoc|Unberechtigter Zugriff +2024-11-13 17:44:29.2873|DEBUG|OnDoc|Start GetDocument DokumentID:OFFEDK0002007001960501 +2024-11-13 17:44:29.3575|DEBUG|OnDoc| +2024-11-13 17:44:29.3575|DEBUG|OnDoc|Ende GetDocument DokumentID:OFFEDK0002007001960501 +2024-11-13 17:44:57.1819|ERROR|OnDoc|Unberechtigter Zugriff +2024-11-13 17:45:27.3722|ERROR|OnDoc|Unberechtigter Zugriff +2024-11-13 17:45:43.5209|DEBUG|OnDoc|Start Adresse GetAll +2024-11-13 17:45:43.5659|DEBUG|OnDoc| +2024-11-13 17:45:43.5659|DEBUG|OnDoc|Ende Adresse GetAll diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 5b89f24c..f3728a4a 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index ed429271..d2f4e560 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 689aa1b9..3d86d0a2 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/build.force b/API_NetFramework/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/API_NetFramework/obj/Release/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Release/API_NetFramework.csproj.AssemblyReference.cache index ad25ee1e..7a6c07a0 100644 Binary files a/API_NetFramework/obj/Release/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Release/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Release/OnDoc_NetFramework.dll b/API_NetFramework/obj/Release/OnDoc_NetFramework.dll index 6320ef05..a431ae66 100644 Binary files a/API_NetFramework/obj/Release/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Release/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Release/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Release/OnDoc_NetFramework.pdb index 6602f73e..d67f7deb 100644 Binary files a/API_NetFramework/obj/Release/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Release/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/Web.config b/API_NetFramework/obj/Release/Package/PackageTmp/Web.config index d1f5ddc5..e6ce2e9c 100644 --- a/API_NetFramework/obj/Release/Package/PackageTmp/Web.config +++ b/API_NetFramework/obj/Release/Package/PackageTmp/Web.config @@ -12,10 +12,11 @@ - + + - + diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.dll b/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.dll index e3e005e4..2bf69b2b 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.dll and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.dll differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.pdb b/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.pdb index 3d67c746..9029404b 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.pdb and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.dll b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.dll index 2389921e..5c8d7e17 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.dll and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.dll differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.pdb b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.pdb index c7adc2b3..e7bac381 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.pdb and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Database.pdb differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.dll b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.dll index 443ab744..8d1bb622 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.dll and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.dll differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.pdb b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.pdb index 4f7ca99e..92cd7919 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.pdb and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/Model.pdb differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.dll b/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.dll index 6320ef05..a431ae66 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.pdb index 6602f73e..d67f7deb 100644 Binary files a/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Release/Package/PackageTmp/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Release/TransformWebConfig/original/Web.config b/API_NetFramework/obj/Release/TransformWebConfig/original/Web.config index 4b1ee6b3..706c76ff 100644 --- a/API_NetFramework/obj/Release/TransformWebConfig/original/Web.config +++ b/API_NetFramework/obj/Release/TransformWebConfig/original/Web.config @@ -12,10 +12,13 @@ - + + - + diff --git a/API_NetFramework/obj/Release/TransformWebConfig/transformed/Web.config b/API_NetFramework/obj/Release/TransformWebConfig/transformed/Web.config index d1f5ddc5..e6ce2e9c 100644 --- a/API_NetFramework/obj/Release/TransformWebConfig/transformed/Web.config +++ b/API_NetFramework/obj/Release/TransformWebConfig/transformed/Web.config @@ -12,10 +12,11 @@ - + + - + diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index 5f35b952..cf86c724 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index 07058233..51f3dde3 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index c9e35d5f..96f98ea4 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs index 3ecbda90..8c109bee 100644 --- a/Client/DocMgmt/Serienbrief.Designer.cs +++ b/Client/DocMgmt/Serienbrief.Designer.cs @@ -76,7 +76,6 @@ this.ctxmenuEmpfaenger = new System.Windows.Forms.ContextMenuStrip(this.components); this.partnerHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ausListeLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.erneutGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid(); @@ -599,37 +598,29 @@ this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.partnerHinzufügenToolStripMenuItem, this.partnerLöschenToolStripMenuItem, - this.ausListeLöschenToolStripMenuItem, this.erneutGenerierenToolStripMenuItem}); this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger"; - this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(176, 92); + this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92); // // partnerHinzufügenToolStripMenuItem // this.partnerHinzufügenToolStripMenuItem.Name = "partnerHinzufügenToolStripMenuItem"; - this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.partnerHinzufügenToolStripMenuItem.Text = "Partner hinzufügen"; this.partnerHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.partnerHinzufügenToolStripMenuItem_Click); // // partnerLöschenToolStripMenuItem // this.partnerLöschenToolStripMenuItem.Name = "partnerLöschenToolStripMenuItem"; - this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.partnerLöschenToolStripMenuItem.Text = "Partner löschen"; this.partnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.partnerLöschenToolStripMenuItem_Click); // - // ausListeLöschenToolStripMenuItem - // - this.ausListeLöschenToolStripMenuItem.Name = "ausListeLöschenToolStripMenuItem"; - this.ausListeLöschenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.ausListeLöschenToolStripMenuItem.Text = "Aus Liste löschen"; - this.ausListeLöschenToolStripMenuItem.Click += new System.EventHandler(this.ausListeLöschenToolStripMenuItem_Click); - // // erneutGenerierenToolStripMenuItem // this.erneutGenerierenToolStripMenuItem.Name = "erneutGenerierenToolStripMenuItem"; - this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.erneutGenerierenToolStripMenuItem.Text = "Erneut generieren"; + this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.erneutGenerierenToolStripMenuItem.Text = "Generierung zurücksetzen"; this.erneutGenerierenToolStripMenuItem.Click += new System.EventHandler(this.erneutGenerierenToolStripMenuItem_Click); // // treeViewAdv1 @@ -964,7 +955,7 @@ this.pnlLoad.Controls.Add(this.btnsbloadcancel); this.pnlLoad.Controls.Add(this.btnsbloadok); this.pnlLoad.Controls.Add(this.panel1); - this.pnlLoad.Location = new System.Drawing.Point(216, 51); + this.pnlLoad.Location = new System.Drawing.Point(1024, 72); this.pnlLoad.Name = "pnlLoad"; this.pnlLoad.Size = new System.Drawing.Size(493, 634); this.pnlLoad.TabIndex = 4; @@ -1177,7 +1168,6 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.RibbonPanel ribbonPanel9; private System.Windows.Forms.RibbonButton RibbonButtonArchivierenUndAbschlessen; - private System.Windows.Forms.ToolStripMenuItem ausListeLöschenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem erneutGenerierenToolStripMenuItem; } } \ No newline at end of file diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs index 2f33ad0e..f778fc28 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/DocMgmt/Serienbrief.cs @@ -10,6 +10,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Remoting.Messaging; using System.Text; using System.Threading.Tasks; +using System.Web.Caching; using System.Windows.Forms; using System.Xml.Linq; using Database; @@ -118,7 +119,7 @@ namespace OnDoc.UIControls private void RibbonButtonExcelImport_Click(object sender, EventArgs e) { - + System.Data.DataTable importdata = new System.Data.DataTable(); openFileDialog1.Filter = "Excel-Dateien files (*.xlsx)|*.xlsx|CSV-Dateien (*.csv)|*.csv|Alle Dateien (*.*)|*.*"; openFileDialog1.FilterIndex = 0; @@ -186,7 +187,7 @@ namespace OnDoc.UIControls } dB = null; refresh_empfaenger(sb.dsempfaenger.Tables[0]); - + finish_progress(); //sfDataGridEmpfaenger.DataSource = importdata; } @@ -198,7 +199,8 @@ namespace OnDoc.UIControls sfDataGridEmpfaenger.DataSource = dt; update_zahlen(); } - private void refresh_spalten() { + private void refresh_spalten() + { //sfDataGridEmpfaenger.Columns["STATUS"].Visible = false; //sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false; //sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false; @@ -210,7 +212,7 @@ namespace OnDoc.UIControls //sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false; sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false; sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false; - sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false; + sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false; sfDataGridEmpfaenger.Columns["Anrede"].Width = 0; sfDataGridEmpfaenger.Columns["Name"].Visible = false; sfDataGridEmpfaenger.Columns["Vorname"].Visible = false; @@ -218,7 +220,7 @@ namespace OnDoc.UIControls sfDataGridEmpfaenger.Columns["PLZ"].Visible = false; sfDataGridEmpfaenger.Columns["Ort"].Visible = false; - + } private void init_empfaenger(int serienbriefnr) { @@ -349,10 +351,10 @@ namespace OnDoc.UIControls DB db = new DB(AppParams.connectionstring); if (newsb) { - db.Get_Tabledata("Select bezeichnung,office_vorlagenr from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); + db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]); - + sb.vertrag= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]); } } @@ -371,7 +373,7 @@ namespace OnDoc.UIControls try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; } try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; } sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value); - sb.dokumentdatum= Convert.ToDateTime(DateDokumentDatum.Value); + sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value); DB db = new DB(AppParams.connectionstring); sb.serienbriefnr = db.Save_Serienbrief(sb, AppParams.tempdir); db.save_sb_vorlage_to_db(sb.filename, "", sb.serienbriefnr); @@ -383,6 +385,7 @@ namespace OnDoc.UIControls { try { + int inbearbeitung = 0; int fehlerhaft = 0; int generiert = 0; @@ -410,16 +413,30 @@ namespace OnDoc.UIControls RibbonButtonArchivierenUndAbschlessen.Enabled = false; ribbonButtonDruckstapel.Enabled = false; if (inbearbeitung > 0) { RibbonButtonGenerateSB.Enabled = true; } - if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0) { + if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0) + { RibbonButtonArchivierenUndAbschlessen.Enabled = true; ribbonButtonDruckstapel.Enabled = true; } - + enable_disable(true); + if (generiert > 0 || abgeschlossen > 0) + { + enable_disable(false); + } } catch { } } + private void enable_disable(bool enabled) + { + groupBox5.Enabled = enabled; + groupBox6.Enabled = enabled; + groupBox7.Enabled = enabled; + groupBox8.Enabled = enabled; + ribbonButton1.Enabled = enabled; + } + private void Set_Functions(int type) { @@ -429,23 +446,23 @@ namespace OnDoc.UIControls ctxmenuEmpfaenger.Enabled = true; partnerHinzufügenToolStripMenuItem.Visible = true; partnerLöschenToolStripMenuItem.Visible = true; - ausListeLöschenToolStripMenuItem.Visible = false; + erneutGenerierenToolStripMenuItem.Visible = false; docPreview1.Visible = false; } - if (type == 3 || type==4) + if (type == 3 || type == 4) { partnerHinzufügenToolStripMenuItem.Visible = false; partnerLöschenToolStripMenuItem.Visible = false; sfDataGridEmpfaenger.AllowEditing = false; - ausListeLöschenToolStripMenuItem.Visible = true; + erneutGenerierenToolStripMenuItem.Visible = true; docPreview1.clear_viewer(); docPreview1.Visible = true; //ctxmenuEmpfaenger.Enabled = false; - + } } @@ -453,42 +470,42 @@ namespace OnDoc.UIControls { update_grid(); } - private void update_grid() - { - string nodetext = treeViewAdv1.SelectedNode.Text; - DataView dv = new DataView(sb.dsempfaenger.Tables[0]); + private void update_grid() + { + string nodetext = treeViewAdv1.SelectedNode.Text; + DataView dv = new DataView(sb.dsempfaenger.Tables[0]); - switch (nodetext.Substring(0, 5)) - { - case "In Be": - dv.RowFilter = "Status = 0"; - sfDataGridEmpfaenger.DataSource = null; - sfDataGridEmpfaenger.DataSource = dv; + switch (nodetext.Substring(0, 5)) + { + case "In Be": + dv.RowFilter = "Status = 0"; + sfDataGridEmpfaenger.DataSource = null; + sfDataGridEmpfaenger.DataSource = dv; refresh_spalten(); - Set_Functions(1); - break; - case "Fehle": - dv.RowFilter = "Status=-1"; - sfDataGridEmpfaenger.DataSource = null; - sfDataGridEmpfaenger.DataSource = dv; + Set_Functions(1); + break; + case "Fehle": + dv.RowFilter = "Status=-1"; + sfDataGridEmpfaenger.DataSource = null; + sfDataGridEmpfaenger.DataSource = dv; refresh_spalten(); Set_Functions(2); - break; - case "Gener": - dv.RowFilter = "Status = 1"; - sfDataGridEmpfaenger.DataSource = null; - sfDataGridEmpfaenger.DataSource = dv; + break; + case "Gener": + dv.RowFilter = "Status = 1"; + sfDataGridEmpfaenger.DataSource = null; + sfDataGridEmpfaenger.DataSource = dv; refresh_spalten(); Set_Functions(3); - break; - case "Abges": - dv.RowFilter = "Status = 2"; - sfDataGridEmpfaenger.DataSource = null; - sfDataGridEmpfaenger.DataSource = dv; + break; + case "Abges": + dv.RowFilter = "Status = 2"; + sfDataGridEmpfaenger.DataSource = null; + sfDataGridEmpfaenger.DataSource = dv; refresh_spalten(); Set_Functions(4); - break; - } + break; } + } private void ribbonbuttonsave_Click(object sender, EventArgs e) @@ -937,7 +954,8 @@ namespace OnDoc.UIControls { Insert_Value(vorlagendaten.Rows[i][i1].ToString(), vorlagendaten.Columns[i1].ColumnName); } - } catch { } + } + catch { } try { if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "I_09_") @@ -957,24 +975,32 @@ namespace OnDoc.UIControls // IntWert = RenCol(IntWert) Insert_Value(vorlagendaten.Rows[i][IntWert].ToString(), Intbookmark); } - } catch { } + } + catch { } } string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb)); Helper.FileHelper fh = new FileHelper(); DB db = new DB(AppParams.connectionstring); - string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf"; + System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString() + "'").FirstOrDefault(); + string dokumentid = ""; + if (dr != null) + { + dokumentid = dr["dokumentid"].ToString(); + } + if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); } + string filename = dokumentid + ".pdf"; + //string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf"; + fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename); - db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename); + db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename, dokumentid); System.IO.File.Delete(AppParams.tempdir + filename); db = null; - System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString()+"'").FirstOrDefault(); if (dr != null) { dr["STATUS"] = "1"; + dr["Dokumentid"] = dokumentid; } - - sb.DocValues.Clear(); } @@ -1232,7 +1258,7 @@ namespace OnDoc.UIControls private void merge() { - + DataView dv = new DataView(sb.dsempfaenger.Tables[0]); dv.RowFilter = "Status = 1"; @@ -1251,7 +1277,7 @@ namespace OnDoc.UIControls { add_progress(); System.Data.DataRow dr = rowView.Row; - db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString(), false, true); + db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString()+"'", false, true); var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString())); if (stream.Length > 0) { @@ -1260,9 +1286,9 @@ namespace OnDoc.UIControls if (i >= stapelgroesse) { save_stapel(stapel, ref streams); - + i = 0; - streams = new Stream[dv.Count-(stapel*stapelgroesse)]; + streams = new Stream[dv.Count - (stapel * stapelgroesse)]; stapel++; } } @@ -1298,7 +1324,7 @@ namespace OnDoc.UIControls fs.Close(); fs.Dispose(); TreeNodeAdv tn = new TreeNodeAdv(); - tn.Text = "Druckstapel " + stapelnr.ToString()+" ("+streams.Length.ToString()+")"; + tn.Text = "Druckstapel " + stapelnr.ToString() + " (" + streams.Length.ToString() + ")"; tn.Tag = stapelnr.ToString(); tn.TagObject = filename; treeviewDruckstapel.Nodes.Add(tn); @@ -1336,7 +1362,7 @@ namespace OnDoc.UIControls private void RibbonButtonArchivierenUndAbschlessen_CanvasChanged(object sender, EventArgs e) { - + } private void RibbonButtonArchivierenUndAbschlessen_Click(object sender, EventArgs e) @@ -1429,7 +1455,7 @@ namespace OnDoc.UIControls { finish_progress(); } - + } private void ausListeLöschenToolStripMenuItem_Click(object sender, EventArgs e) @@ -1446,7 +1472,7 @@ namespace OnDoc.UIControls System.Data.DataTable dt = sb.dsempfaenger.Tables[0]; var records = sfDataGridEmpfaenger.View.GetSelectedRecords(); - + if (records.Count < 1) { return; } int[] inteintraege = new int[records.Count]; int i = 0; @@ -1456,11 +1482,11 @@ namespace OnDoc.UIControls string documentid = datarow["dokumentid"].ToString(); inteintraege[i] = Convert.ToInt32(datarow["inteintragnr"].ToString()); i = i + 1; - + } - for (int i1 = 0; i1 < i; i1++) + for (int i1 = 0; i1 < i; i1++) { - System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("inteintragnr='" + inteintraege[i1].ToString()+"'").FirstOrDefault(); // finds all rows with id==2 and selects first or null if haven't found any + System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("inteintragnr='" + inteintraege[i1].ToString() + "'").FirstOrDefault(); // finds all rows with id==2 and selects first or null if haven't found any if (dr != null) { dr["status"] = "0"; //changes the Product_name @@ -1469,5 +1495,6 @@ namespace OnDoc.UIControls refresh_empfaenger(sb.dsempfaenger.Tables[0]); } + } } diff --git a/Client/UIControls/DocPreview.cs b/Client/UIControls/DocPreview.cs index a1500704..0a8c322a 100644 --- a/Client/UIControls/DocPreview.cs +++ b/Client/UIControls/DocPreview.cs @@ -101,7 +101,7 @@ namespace OnDoc.UIControls { return dok; ; } - if (AppParams.RESTURI != "") + if (AppParams.UseAPI == "YES") { string URL = AppParams.RESTURI + "api/GetDocument?dokid=" + dokumentid; if (AsPDF == true) diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 1b8e2d7d..185648b4 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -286,7 +286,7 @@ namespace OnDoc.UICintrols { return dok; ; } - if (AppParams.RESTURI != "") + if (AppParams.UseAPI == "YES") { string URL = AppParams.RESTURI + "api/GetDocument?dokid=" + selected_dokumentid; if (AsPDF == true) @@ -557,6 +557,8 @@ namespace OnDoc.UICintrols case 3: break; case 4: + archivedoc(frmnewdok.dokumentid); + break; case 5: break; @@ -824,6 +826,35 @@ namespace OnDoc.UICintrols nv.Show(); } + private void archivedoc (string documentid) + { + string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid; + + HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; + webRequest.Method = WebRequestMethods.Http.Get; + webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey; + try + { + using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse) + { + if (response.StatusCode == HttpStatusCode.OK) + { + StreamReader reader = new StreamReader(response.GetResponseStream()); + string responseContent = reader.ReadToEnd(); + Logging.DocLog.Info("Dokument archiviert", "OnDoc", documentid, "", "Dokument archiviert und abgeschlossen"); + } + else + { + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde abgebrochen." + Environment.NewLine + "Fehler: " + response.StatusDescription); + Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", ""); + } + } + } + catch (Exception ex) + { + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message); + } + } private void RibbonButtonArchivToOnBase_Click(object sender, EventArgs e) { var records = sfDataGrid1.View.GetSelectedRecords(); @@ -836,8 +867,9 @@ namespace OnDoc.UICintrols var datarow = record as DataRowView; string documentid = datarow["dokumentid"].ToString(); + + archivedoc(documentid); string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid; - HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; webRequest.Method = WebRequestMethods.Http.Get; diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index bd7be8e4..a1b4faf5 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index 2aa1a24a..5304dbd6 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 5f35b952..cf86c724 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index 07058233..51f3dde3 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 9df3c4a5..a168b836 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index f99be928..e535001c 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index ab1ec2c3..cf2181c3 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index d9cc89fa..9b120f6d 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index f7df44f0..00316fbd 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 33caf285..094167ca 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 9df3c4a5..a168b836 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index f99be928..e535001c 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/build.force b/Client/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index ab1ec2c3..cf2181c3 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index bd7be8e4..a1b4faf5 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index 2aa1a24a..5304dbd6 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index 5f35b952..cf86c724 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index 07058233..51f3dde3 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/bin/Release/DOCGEN.dll b/DOCGEN/bin/Release/DOCGEN.dll index e3e005e4..2bf69b2b 100644 Binary files a/DOCGEN/bin/Release/DOCGEN.dll and b/DOCGEN/bin/Release/DOCGEN.dll differ diff --git a/DOCGEN/bin/Release/DOCGEN.pdb b/DOCGEN/bin/Release/DOCGEN.pdb index 3d67c746..9029404b 100644 Binary files a/DOCGEN/bin/Release/DOCGEN.pdb and b/DOCGEN/bin/Release/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Release/Database.dll b/DOCGEN/bin/Release/Database.dll index 2389921e..5c8d7e17 100644 Binary files a/DOCGEN/bin/Release/Database.dll and b/DOCGEN/bin/Release/Database.dll differ diff --git a/DOCGEN/bin/Release/Database.pdb b/DOCGEN/bin/Release/Database.pdb index c7adc2b3..e7bac381 100644 Binary files a/DOCGEN/bin/Release/Database.pdb and b/DOCGEN/bin/Release/Database.pdb differ diff --git a/DOCGEN/bin/Release/Model.dll b/DOCGEN/bin/Release/Model.dll index 443ab744..8d1bb622 100644 Binary files a/DOCGEN/bin/Release/Model.dll and b/DOCGEN/bin/Release/Model.dll differ diff --git a/DOCGEN/bin/Release/Model.pdb b/DOCGEN/bin/Release/Model.pdb index 4f7ca99e..92cd7919 100644 Binary files a/DOCGEN/bin/Release/Model.pdb and b/DOCGEN/bin/Release/Model.pdb differ diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs index affe37db..86b11a59 100644 --- a/DOCGEN/clsDocGen.cs +++ b/DOCGEN/clsDocGen.cs @@ -82,7 +82,9 @@ namespace DOCGEN dd.Unterschrift_Rechts = sb.unterschriftrechts.ToString(); dd.DocValues = sb.DocValues; dd.As_Faksimile = sb.faksimile_unterschrfit.ToString(); + dd.Barcode = sb.vertrag == 1; dok.dokument = sfword.Generate_Word(vorlage,dd); + dok.doktype = "D"; sfword = null; diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index bd7be8e4..a1b4faf5 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index 2aa1a24a..5304dbd6 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 6d7ab200..77c3e91c 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/DOCGEN/obj/Debug/build.force b/DOCGEN/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/DOCGEN/obj/Release/DOCGEN.csproj.AssemblyReference.cache b/DOCGEN/obj/Release/DOCGEN.csproj.AssemblyReference.cache index f5b9342d..c72ac67e 100644 Binary files a/DOCGEN/obj/Release/DOCGEN.csproj.AssemblyReference.cache and b/DOCGEN/obj/Release/DOCGEN.csproj.AssemblyReference.cache differ diff --git a/DOCGEN/obj/Release/DOCGEN.dll b/DOCGEN/obj/Release/DOCGEN.dll index e3e005e4..2bf69b2b 100644 Binary files a/DOCGEN/obj/Release/DOCGEN.dll and b/DOCGEN/obj/Release/DOCGEN.dll differ diff --git a/DOCGEN/obj/Release/DOCGEN.pdb b/DOCGEN/obj/Release/DOCGEN.pdb index 3d67c746..9029404b 100644 Binary files a/DOCGEN/obj/Release/DOCGEN.pdb and b/DOCGEN/obj/Release/DOCGEN.pdb differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index 5f35b952..cf86c724 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index 07058233..51f3dde3 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/bin/Release/Database.dll b/Database/bin/Release/Database.dll index 2389921e..5c8d7e17 100644 Binary files a/Database/bin/Release/Database.dll and b/Database/bin/Release/Database.dll differ diff --git a/Database/bin/Release/Database.pdb b/Database/bin/Release/Database.pdb index c7adc2b3..e7bac381 100644 Binary files a/Database/bin/Release/Database.pdb and b/Database/bin/Release/Database.pdb differ diff --git a/Database/bin/Release/Model.dll b/Database/bin/Release/Model.dll index 443ab744..8d1bb622 100644 Binary files a/Database/bin/Release/Model.dll and b/Database/bin/Release/Model.dll differ diff --git a/Database/bin/Release/Model.pdb b/Database/bin/Release/Model.pdb index 4f7ca99e..92cd7919 100644 Binary files a/Database/bin/Release/Model.pdb and b/Database/bin/Release/Model.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 5d77fe87..85e7adc0 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -182,7 +182,7 @@ namespace Database #endregion public string generate_key(string dbkey) { - string skey = "ONDOC0000"; + string skey = "OFFEDK000"; string s = ""; s = DateTime.Now.Year.ToString().Trim(); string dt = s; @@ -1373,10 +1373,11 @@ namespace Database return true; } - public string save_serienbrief_datei(int serienbriefnr, int eintragnr, string filename) + public string save_serienbrief_datei(int serienbriefnr, int eintragnr, string filename, string dokumentid) { SqlConnection Connection = new SqlConnection(); - SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where inteintragnr=" + eintragnr.ToString() + " and serienbriefnr=" + serienbriefnr.ToString(), Connection); + SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where dokumentid='"+dokumentid+"'", Connection); + //SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where inteintragnr = " + eintragnr.ToString() + " and serienbriefnr = " + serienbriefnr.ToString(), Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); DataSet ds = new DataSet(); FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read); @@ -1395,6 +1396,7 @@ namespace Database myRow[1] = serienbriefnr.ToString(); myRow[2] = eintragnr.ToString(); myRow[3] = mydata; + myRow[4] = dokumentid; ds.Tables[0].Rows.Add(myRow); DA.Update(ds, "sbdokument"); } diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 7385afea..38e0af0b 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 5f35b952..cf86c724 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index 07058233..51f3dde3 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/Database/obj/Debug/build.force b/Database/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/Database/obj/Release/Database.csproj.AssemblyReference.cache b/Database/obj/Release/Database.csproj.AssemblyReference.cache index e3a4cca9..a0b067cd 100644 Binary files a/Database/obj/Release/Database.csproj.AssemblyReference.cache and b/Database/obj/Release/Database.csproj.AssemblyReference.cache differ diff --git a/Database/obj/Release/Database.dll b/Database/obj/Release/Database.dll index 2389921e..5c8d7e17 100644 Binary files a/Database/obj/Release/Database.dll and b/Database/obj/Release/Database.dll differ diff --git a/Database/obj/Release/Database.pdb b/Database/obj/Release/Database.pdb index c7adc2b3..e7bac381 100644 Binary files a/Database/obj/Release/Database.pdb and b/Database/obj/Release/Database.pdb differ diff --git a/ILMocup/ILMocup.csproj.user b/ILMocup/ILMocup.csproj.user index 8f0abe62..5c90209e 100644 --- a/ILMocup/ILMocup.csproj.user +++ b/ILMocup/ILMocup.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ApiControllerEmptyScaffolder root/Common/Web API 600 diff --git a/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache b/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache index 86360927..d79f0f4c 100644 Binary files a/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache and b/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache differ diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll index 443ab744..8d1bb622 100644 Binary files a/Model/bin/Release/Model.dll and b/Model/bin/Release/Model.dll differ diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb index 4f7ca99e..92cd7919 100644 Binary files a/Model/bin/Release/Model.pdb and b/Model/bin/Release/Model.pdb differ diff --git a/Model/clsSerienbrief.cs b/Model/clsSerienbrief.cs index a5491eb9..cd771b9c 100644 --- a/Model/clsSerienbrief.cs +++ b/Model/clsSerienbrief.cs @@ -42,6 +42,7 @@ namespace Model public int bestaetigt { get; set; } = 0; public int ausgeloest { get; set; } = 0; public int bldossier { get; set; } = 0; + public int vertrag { get; set; } = 0; public int officevorlagenr { get; set; } = 0; public string filename { get; set; } diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index c93b0ee9..82ff892d 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index fe3263e2..4d2db873 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll index 443ab744..8d1bb622 100644 Binary files a/Model/obj/Release/Model.dll and b/Model/obj/Release/Model.dll differ diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb index 4f7ca99e..92cd7919 100644 Binary files a/Model/obj/Release/Model.pdb and b/Model/obj/Release/Model.pdb differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs index adf5760c..89e6480a 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+23a308ad7320abe3abc26d7e1824aa063a3c912b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+09bcee5a2a2fa8276c72810a49a562526c03af7a")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index f5343e6d..a13af2bb 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -06acbe864ff13de1679a4ee6a4796240ef96bb2286d2886d67152bc67b0e59b6 +de523092a1c30ea418cd36aab992f15f4a7aee23c1d8a6429c8df751e96e63d0 diff --git a/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfo.cs index 39c1d857..b74bc225 100644 --- a/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+23a308ad7320abe3abc26d7e1824aa063a3c912b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+09bcee5a2a2fa8276c72810a49a562526c03af7a")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index 13dbf3e4..1f4a5df8 100644 --- a/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Release/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -d59eeb3ac667119b1e7592bbc21701a5385abc899b677e108f1e4b5f078445e7 +70b08ec97f661f278137162fa948dd34da310f4c56b7502b5e1c484e23808560 diff --git a/OnDocWeb/OnDocWeb.csproj.user b/OnDocWeb/OnDocWeb.csproj.user index 198c1316..71ba3b2a 100644 --- a/OnDocWeb/OnDocWeb.csproj.user +++ b/OnDocWeb/OnDocWeb.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU