diff --git a/src/Server/Controllers/Frontend/HomeController.cs b/src/Server/Controllers/Frontend/HomeController.cs index f0467ab..4ee52ec 100644 --- a/src/Server/Controllers/Frontend/HomeController.cs +++ b/src/Server/Controllers/Frontend/HomeController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Server.Helper; using Shared.Models; using Server.Exceptions; +using Server.Models; namespace Server.Controllers; [ApiController] @@ -11,15 +12,22 @@ namespace Server.Controllers; public class HomeController : Controller { private readonly ILogger _logger; + private readonly SearchdomainManager _domainManager; + public HomeController(ILogger logger, IConfiguration config, SearchdomainManager domainManager, SearchdomainHelper searchdomainHelper, DatabaseHelper databaseHelper) { _logger = logger; + _domainManager = domainManager; } [Authorize] [HttpGet("/")] public IActionResult Index() { - return View(); + HomeIndexViewModel viewModel = new() + { + Searchdomains = _domainManager.ListSearchdomains() + }; + return View(viewModel); } } \ No newline at end of file diff --git a/src/Server/Models/HomeViewModels.cs b/src/Server/Models/HomeViewModels.cs new file mode 100644 index 0000000..0accb93 --- /dev/null +++ b/src/Server/Models/HomeViewModels.cs @@ -0,0 +1,6 @@ +namespace Server.Models; + +public class HomeIndexViewModel +{ + public required List Searchdomains { get; set; } +} \ No newline at end of file diff --git a/src/Server/Searchdomain.cs b/src/Server/Searchdomain.cs index 311760a..1df5dc7 100644 --- a/src/Server/Searchdomain.cs +++ b/src/Server/Searchdomain.cs @@ -51,7 +51,7 @@ public class Searchdomain { ["id"] = this.id }; - DbDataReader embeddingReader = helper.ExecuteSQLCommand("SELECT embedding.id, id_datapoint, model, embedding FROM embedding", parametersIDSearchdomain); // TODO fix: parametersIDSearchdomain defined, but not used + DbDataReader embeddingReader = helper.ExecuteSQLCommand("SELECT e.id, e.id_datapoint, e.model, e.embedding FROM embedding e JOIN datapoint d ON e.id_datapoint = d.id JOIN entity ent ON d.id_entity = ent.id JOIN searchdomain s ON ent.id_searchdomain = s.id WHERE s.id = @id", parametersIDSearchdomain); Dictionary> embedding_unassigned = []; while (embeddingReader.Read()) { @@ -83,7 +83,7 @@ public class Searchdomain } embeddingReader.Close(); - DbDataReader datapointReader = helper.ExecuteSQLCommand("SELECT id, id_entity, name, probmethod_embedding, similaritymethod, hash FROM datapoint", parametersIDSearchdomain); + DbDataReader datapointReader = helper.ExecuteSQLCommand("SELECT d.id, d.id_entity, d.name, d.probmethod_embedding, d.similaritymethod, d.hash FROM datapoint d JOIN entity ent ON d.id_entity = ent.id JOIN searchdomain s ON ent.id_searchdomain = s.id WHERE s.id = @id", parametersIDSearchdomain); Dictionary> datapoint_unassigned = []; while (datapointReader.Read()) { @@ -107,7 +107,7 @@ public class Searchdomain } datapointReader.Close(); - DbDataReader attributeReader = helper.ExecuteSQLCommand("SELECT id, id_entity, attribute, value FROM attribute", parametersIDSearchdomain); + DbDataReader attributeReader = helper.ExecuteSQLCommand("SELECT a.id, a.id_entity, a.attribute, a.value FROM attribute a JOIN entity ent ON a.id_entity = ent.id JOIN searchdomain s ON ent.id_searchdomain = s.id WHERE s.id = @id", parametersIDSearchdomain); Dictionary> attributes_unassigned = []; while (attributeReader.Read()) { diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml index f8821f2..e1781b0 100644 --- a/src/Server/Views/Home/Index.cshtml +++ b/src/Server/Views/Home/Index.cshtml @@ -1,8 +1,217 @@ -@{ +@using Server.Models +@using System.Web +@model HomeIndexViewModel +@{ ViewData["Title"] = "Home Page"; + int i = 0; + Dictionary domains = []; + Model.Searchdomains.ForEach(domain => + { + domains[i++] = domain; + }); } -
-

Welcome

-

Learn about building Web apps with ASP.NET Core.

+
+
+ + + + + +
+ +
+
+ + +
+

Searchdomain1

+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ Cache utilization: 2.47MiB +
+ +
+ + +
+
+
+ Recent queries + +
+ + @*
+ Some test query + +
+
+ Some other test query + +
*@ +
+
+ + +
+
+
+ Entities + +
+
+ + + + + + + + + +
NameAction
+ + @*
+ Someentity + +
+
+ Some other test query + +
*@ +
+
+ +
+
+ +
+
+ + \ No newline at end of file diff --git a/src/Server/Views/Shared/_Layout.cshtml b/src/Server/Views/Shared/_Layout.cshtml index 042d42e..7b398f8 100644 --- a/src/Server/Views/Shared/_Layout.cshtml +++ b/src/Server/Views/Shared/_Layout.cshtml @@ -3,16 +3,15 @@ - @ViewData["Title"] - test + @ViewData["Title"] - embeddingsearch -