update 20241127

API_NetFramework/Controllers/AntwortAdressController.cs

@@ -12,6 +12,15 @@ using System.Runtime.Serialization.Formatters;
 using System.Web;
 using System.Web.Http;
 using SecuringWebApiUsingApiKey.Middleware;
+using Newtonsoft.Json;
+using System.Web.Http.Results;
+using Microsoft.Ajax.Utilities;
+using System.Data.SqlClient;
+using System.Data;
+using System.Text.RegularExpressions;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using System.Web.Helpers;
 
 namespace API_NetFramework.Controllers
 {
@@ -48,7 +57,7 @@ namespace API_NetFramework.Controllers
                 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());
+                return Ok(JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString()));
             }
             catch (Exception e) 
             { 
@@ -89,7 +98,7 @@ namespace API_NetFramework.Controllers
                 } else {
                     APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetByID ID:" + ID, LogLevelType.Debug);
 
-                    return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); 
+                    return Ok(JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString())); 
                 };
             }
             catch (Exception e)
@@ -107,7 +116,7 @@ namespace API_NetFramework.Controllers
         /// <returns></returns>
         /// <remarks></remarks>
         [HttpGet]
-        [Route("API/API/AntwortAdresse/GetAllMitarbeiterByTGNummer")]
+        [Route("API/ntwortAdresse/GetAllMitarbeiterByTGNummer")]
 
         public IHttpActionResult GetAllMitarbeiterByTGNummer(string tgnummer, string OutFormat = "JSON")
         {
@@ -131,7 +140,7 @@ namespace API_NetFramework.Controllers
                 } else {
                     APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug);
 
-                    return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); 
+                    return Ok(JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString())); 
                 };
             }
             catch (Exception e)
@@ -141,7 +150,7 @@ namespace API_NetFramework.Controllers
             }
         }
         [HttpGet]
-        [Route("API/API/AntwortAdresse/GetAllMitarbeiterByMitarbeiterNr")]
+        [Route("API/AntwortAdresse/GetAllMitarbeiterByMitarbeiterNr")]
         /// <summary>
         /// GetAllMitarbeiterByMitarbeiternr liefert die persönlichen Adressen eines Mitarbeiters
         /// </summary>
@@ -170,7 +179,7 @@ namespace API_NetFramework.Controllers
                     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()); 
+                    return Ok(JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString())); 
                 };
             }
             catch (Exception e)
@@ -182,7 +191,7 @@ namespace API_NetFramework.Controllers
 
         
         [HttpGet]
-        [Route("API/API/AntwortAdresse/GetMitarbeiterByID")]
+        [Route("API/AntwortAdresse/GetMitarbeiterByID")]
         /// <summary>
         /// GetMitarbeiterByID liefert eine Mitarbeiter-Adrsse mit der ID
         /// </summary>
@@ -212,7 +221,7 @@ namespace API_NetFramework.Controllers
                     return Ok(); 
                 } else {
                     APILogging.Log((HttpRequestMessage)Request, "Ende GetMitarbeiterByID ID: " + ID, LogLevelType.Debug);
-                    return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
+                    return Ok(JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString())); };
             }
             catch (Exception e)
             {
@@ -221,7 +230,7 @@ namespace API_NetFramework.Controllers
             }
         }
         [HttpGet]
-        [Route("API/API/AntwortAdresse/GetMitarbeiterUndStandard")]
+        [Route("API/AntwortAdresse/GetMitarbeiterUndStandard")]
         /// <summary>
         /// GetMitarbeiterByID liefert eine Mitarbeiter-Adrsse mit der ID
         /// </summary>
@@ -253,7 +262,14 @@ namespace API_NetFramework.Controllers
                 else
                 {
                     APILogging.Log((HttpRequestMessage)Request, "Ende GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug);
-                    return Content(HttpStatusCode.OK, db.dsdaten.Tables[0].Rows[0][0].ToString());
+                    //List<adressresponse> adressen = new List<adressresponse>();
+                    //foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+                    //{
+                    //    adressen.Add(new adressresponse() {adresse = dr[0].ToString()});
+                    //}
+                    //var token = JToken.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(adressen));
+                   
+                    return Content(HttpStatusCode.OK, JToken.Parse(db.dsdaten.Tables[0].Rows[0][0].ToString()));
                 };
             }
             catch (Exception e)
@@ -263,5 +279,47 @@ namespace API_NetFramework.Controllers
             }
            
         }
+
+      
+        public string DataTableToJsonObj(DataTable dt)
+        {
+            DataSet ds = new DataSet();
+            ds.Merge(dt);
+            StringBuilder JsonString = new StringBuilder();
+            if (ds != null && ds.Tables[0].Rows.Count > 0)
+            {
+                JsonString.Append("[");
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                {
+                    JsonString.Append("{");
+                    for (int j = 0; j < ds.Tables[0].Columns.Count; j++)
+                    {
+                        if (j < ds.Tables[0].Columns.Count - 1)
+                        {
+                            JsonString.Append("\"" + ds.Tables[0].Columns[j].ColumnName.ToString() + "\":" + "\"" + ds.Tables[0].Rows[i][j].ToString() + "\",");
+                        }
+                        else if (j == ds.Tables[0].Columns.Count - 1)
+                        {
+                            JsonString.Append("\"" + ds.Tables[0].Columns[j].ColumnName.ToString() + "\":" + "\"" + ds.Tables[0].Rows[i][j].ToString() + "\"");
+                        }
+                    }
+                    if (i == ds.Tables[0].Rows.Count - 1)
+                    {
+                        JsonString.Append("}");
+                    }
+                    else
+                    {
+                        JsonString.Append("},");
+                    }
+                }
+                JsonString.Append("]");
+                return JsonString.ToString();
+            }
+            else
+            {
+                return null;
+            }
+        }
+
     }
 }