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

Update 20260514

Browse Source
This commit is contained in:
Stefan Hutter
2026-05-14 10:49:27 +02:00
parent d3d7b06872
commit 83a0703324
247 changed files with 900388 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API_NetFramework/Controllers/DocumentController.cs
+76 -5
View File
@@ -347,7 +347,7 @@ namespace API_NetFramework.Controllers
try
{
// guid = Guid.NewGuid().ToString();
guid = Guid.NewGuid().ToString();
Logging.APIDocLog.Info("CreateDoks Start", "CreateDoks", guid, "");
bool hasattachment = false;
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
@@ -757,7 +757,7 @@ namespace API_NetFramework.Controllers
string mailbody = "";
try
{
//guid = Guid.NewGuid().ToString();
guid = Guid.NewGuid().ToString();
Logging.APIDocLog.Info("Start CreateDoc", "CreateDoc", guid, "");
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
@@ -1016,7 +1016,8 @@ namespace API_NetFramework.Controllers
if (string.IsNullOrEmpty(vp.GASAdresse)) { vp.GASAdresse = ""; }
if (vp.GASAdresse.ToString().Trim() == "") { vp.GAS = ""; } else { vp.GAS = "1"; }
vp.GASSize = doccreate.GASCouvert;
vp.Versandoption = doccreate.VersandOption; ;
vp.Versandoption = doccreate.VersandOption;
vp.ReferenceID= doccreate.Reference;
List<Versanddokument> vdoc = new List<Versanddokument>();
Versanddokument vd = new Versanddokument(dokumentid, doccreate.PartnerNr + " - " + dokdata.Bezeichnung, doccreate.PartnerNr);
vd.dokument = vsdoc;
@@ -1275,7 +1276,7 @@ namespace API_NetFramework.Controllers
dynamic dataj = null;
try
{
//guid = Guid.NewGuid().ToString();
guid = Guid.NewGuid().ToString();
Logging.APIDocLog.Info("Start CreateCLM", "CreateESS", guid, "");
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
@@ -1400,6 +1401,9 @@ namespace API_NetFramework.Controllers
case "11": //Logo
d.itemvalue = GetImageAsBase64(4, -1, 0);
break;
case "20":
d.itemvalue = get_item_table(dr["ess_feldname"].ToString(), ref clmdocitemlist);
break;
case "13": //Vorname
d.itemvalue = Get_OnDoc_Value("13", get_item_value(dr["ess_feldname"].ToString(), ref clmdocitemlist), "");
break;
@@ -1435,12 +1439,16 @@ namespace API_NetFramework.Controllers
case "18": //Pruefziffer
d.itemvalue = pruefziffer(get_item_value(dr["ess_feldname"].ToString(), ref clmdocitemlist));
break;
case "19":
d.itemvalue=get_item_value(dr["ess_feldname"].ToString(), ref clmdocitemlist);
d.field = dr["ess_feldname2"].ToString();
break;
default:
break;
}
if (dr["ess_feldname2"].ToString() != "")
{
if (d.type.ToString() != "17")
if (d.type.ToString() != "17" && d.type!="19")
{
string returnvalue = "";
if (CheckUseField(dr["ess_feldname2"].ToString(), ref clmdocitemlist, ref returnvalue))
@@ -1863,12 +1871,41 @@ namespace API_NetFramework.Controllers
private string gendoc(ref DocCreate doccreate, ref clsDocData dokdata, ref Model.clsdocgendata docgendata, string key)
{
string OwnHost = System.Configuration.ConfigurationManager.AppSettings["OwnHost"].ToString();
string imagepath = System.Configuration.ConfigurationManager.AppSettings["VSImagePath"].ToString();
string dokumentid = "";
;
Database.DB db = new DB(connectionstring);
try
{
db.Get_Tabledata("Select * from ondoc_api_tagformat where dokumenttypnr=" + doccreate.VorlagenTypID.ToString() + "and aktiv=1", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
foreach (attribute apivalue in doccreate.APIValues)
{
foreach (DataRow dr1 in db.dsdaten.Tables[0].Rows)
{
if (dr1["APITag"].ToString() == apivalue.Tag)
{
apivalue.Value = dr1["Format"].ToString().Replace("&value&", apivalue.Value);
if (dr1["Format"].ToString().Contains(@"\n"))
{
apivalue.Value = apivalue.Value.Replace(@"\r\n", Environment.NewLine);
apivalue.Value = apivalue.Value.Replace(@"\n", ((char)13).ToString());
}
}
}
}
}
}
catch { }
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + doccreate.VorlagenTypID, false, true);
try
{
@@ -2323,6 +2360,18 @@ namespace API_NetFramework.Controllers
db.add_parameter("@dokumentid", dokumentid);
db.Get_Tabledata("ondoc_delete_apidoc", true, false);
}
//Funktionen für DB-Updates bei CLM
foreach(CLMDocItem di in clmdocitemlist)
{
if (di.type == "19")
{
db.clear_parameter();
db.add_parameter("@dokumentid", dokumentid);
db.add_parameter("@funktion",di.field);
db.add_parameter("@value", di.itemvalue);
db.Get_Tabledata("OnDoc_Update_CLM_Werte",true,false);
}
}
deflist.Clear();
dget = null;
Generator = null;
@@ -2566,6 +2615,28 @@ namespace API_NetFramework.Controllers
}
private string get_item_table(string inhalt,ref List<CLMDocItem> clmdocitemlist)
{
string result = "";
try
{
for (int i = 0; i < 20; i++)
{
string s = get_item_value(inhalt.Replace("[]", "") + "[" + i.ToString() + "]", ref clmdocitemlist);
if (s != "")
{
result = result + s + Environment.NewLine;
}
}
}
catch
{
return result;
}
return result;
}
private string get_item_value(string inhalt, ref List<CLMDocItem> clmdocitemlist)
{
API_NetFramework/Controllers/MailController.cs
+6 -2
View File
@@ -192,8 +192,12 @@ namespace OnDocAPI_NetFramework.Controllers
{
MailMessage mail = new MailMessage();
SmtpClient SmtpServer = new SmtpClient();
string mailempfaenger = System.Configuration.ConfigurationManager.AppSettings["Mailempfaenger"].ToString();
if (mailempfaenger!="") { email.empfaenger=mailempfaenger; }
string mailempfaengerdefault = System.Configuration.ConfigurationManager.AppSettings["Mailempfaenger"].ToString();
if (email.empfaenger.ToString()=="")
{
email.empfaenger=mailempfaengerdefault;
}
//if (mailempfaenger!="") { email.empfaenger=mailempfaenger; }
mail.To.Add(email.empfaenger);
mail.From = new MailAddress("OnDoc@tkb.ch");
mail.Subject = email.betreff;