feat(ConfigController): GetAnnotationParams aktualisiert, um Wörterbuch zu senden

This reverts commit 80e1e7dcf3.

EnvelopeGenerator.Web/Controllers/ConfigController.cs

@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Web.Models;
+using AngleSharp.Common;
+using EnvelopeGenerator.Web.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -18,6 +19,6 @@ public class ConfigController : ControllerBase
     [HttpGet("Annotations")]
     public IActionResult GetAnnotationParams()
     {
-        return Ok(_annotParams);
+        return Ok(_annotParams.Annotations.ToDictionary(a => a.Name.ToLower(), a => a));
     }
 }

EnvelopeGenerator.Web/Models/Annotation.cs

@@ -15,65 +15,41 @@ public record Annotation
     #endregion
 
     #region Layout
-    internal double _marginLeft = default;
-
-    internal double _marginTop = default;
-
-    internal double _width = default;
-
-    internal double _height = default;
-
     [JsonIgnore]
-    public double MarginLeft
-    {
-        get => _marginLeft;
-        init => _marginLeft = value;
-    }
+    public double? MarginLeft { get; set; }
 
     [JsonIgnore]
     public double MarginLeftRatio { get; init; } = 1;
 
     [JsonIgnore]
-    public double MarginTop
-    {
-        get => _marginTop;
-        init => _marginTop = value;
-    }
+    public double? MarginTop { get; set; }
 
     [JsonIgnore]
     public double MarginTopRatio { get; init; } = 1;
 
-    public double Width
-    {
-        get => _width;
-        init => _width = value;
-    }
+    public double? Width { get; set; }
 
     [JsonIgnore]
     public double WidthRatio { get; init; } = 1;
 
-    public double Height
-    {
-        get => _height;
-        init => _height = value;
-    }
+    public double? Height { get; set; }
 
     [JsonIgnore]
     public double HeightRatio { get; init; } = 1;
     #endregion
 
     #region Position
-    public double Left => MarginLeft + (HorBoundAnnot?.HorBoundary ?? 0);
+    public double Left => (MarginLeft ?? 0) + (HorBoundAnnot?.HorBoundary ?? 0);
 
-    public double Top => MarginTop + (VerBoundAnnot?.VerBoundary ?? 0);
+    public double Top => (MarginTop ?? 0) + (VerBoundAnnot?.VerBoundary ?? 0);
     #endregion
 
     #region Boundary
     [JsonIgnore]
-    public double HorBoundary => Left + Width;
+    public double HorBoundary => Left + (Width ?? 0);
 
     [JsonIgnore]
-    public double VerBoundary => Top + Height;
+    public double VerBoundary => Top + (Height ?? 0);
     #endregion
 
     #region BoundAnnot
@@ -89,18 +65,18 @@ public record Annotation
     { 
         set 
         {
-            // To set default value, annotation must have default (0) value but default must has non-default value
-            if (_marginLeft == default && value.MarginLeft != default)
-                _marginLeft = value.MarginLeft * MarginLeftRatio;
+            // To set null value, annotation must have null (0) value but null must has non-null value
+            if (MarginLeft == null && value.MarginLeft != null)
+                MarginLeft = value.MarginLeft * MarginLeftRatio;
 
-            if (_marginTop == default && value.MarginTop != default)
-                _marginTop = value.MarginTop * MarginTopRatio;
+            if (MarginTop == null && value.MarginTop != null)
+                MarginTop = value.MarginTop * MarginTopRatio;
 
-            if (_width == default && value.Width != default)
-                _width = value.Width * WidthRatio;
+            if (Width == null && value.Width != null)
+                Width = value.Width * WidthRatio;
 
-            if (_height == default && value.Height != default)
-                _height = value.Height * HeightRatio;
+            if (Height == null && value.Height != null)
+                Height = value.Height * HeightRatio;
         }
     }
 };

EnvelopeGenerator.Web/appsettings.json

@@ -153,19 +153,27 @@
   "AnnotationParams": {
     "DefaultAnnotation": {
       "Width": 1,
-      "Height": 0.5
+      "Height": 0.5,
+      "MarginTop": 1
     },
     "Annotations": [
       {
-        "Name": "Signature"
+        "Name": "Signature",
+        "MarginTop": 0
       },
       {
         "Name": "City",
-        "VerBoundAnnotName": "Signature"
+        "VerBoundAnnotName": "Signature",
+        "WidthRatio": 1.2,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": 0.48
       },
       {
         "Name": "Date",
-        "VerBoundAnnotName": "City"
+        "VerBoundAnnotName": "City",
+        "WidthRatio": 1.55,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": 0.45
       }
     ]
   }

EnvelopeGenerator.Web/wwwroot/js/network.js

@@ -69,7 +69,7 @@
      * Creates a GET HTTP request to `url`
      * @param {any} url
      */
-    getRequest(url, body) {
+    getRequest(url) {
         const token = this.getCSRFToken()
         const options = {
             credentials: 'include',
@@ -79,10 +79,6 @@
             }
         }
 
-        if (body !== undefined) {
-            options.body = JSON.stringify(body);
-        }
-
         return fetch(url, options)
     }
 
@@ -206,4 +202,12 @@ async function logout() {
         if (res.ok)
             window.location.href = "/";
     });
+}
+
+function getAnnotationParams() {
+    return fetch(`${window.location.origin}/api/Config/Annotations`, {
+        credentials: 'include',
+        method: 'GET'
+    })
+    .then(res => res.json());
 }

EnvelopeGenerator.Web/wwwroot/js/network.min.js

@@ -1 +1 @@
-async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n,t){const r=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...r}};return t!==undefined&&(i.body=JSON.stringify(t)),fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}
+async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}function getAnnotationParams(){return fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json())}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n){const t=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...t}};return fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}