Revize c9762683

Fixed indexing bugs in backend, minor changes in frontend

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -24 +24 @@
         private readonly IMapper mapper;
 
         private const string TAG_ID_ATTRIBUTE_NAME = "aswi-tag-id";
-        private const string TAG_INSTANCE_ATTRIBUTE_NAME = "aswi-iag-instance";
+        private const string TAG_INSTANCE_ATTRIBUTE_NAME = "aswi-tag-instance";
 
         public AnnotationServiceEF(DatabaseContext context, ILogger logger, IMapper mapper)
         {
@@ -166 +166 @@
             FillNodeDict(descendantsOriginal, descendantsToEdit);
             AssignIdsToOriginalDocument(descendantsOriginal, ref currentId);
 
-            var cssNode = GenerateCSS(docToEdit, tags, new());
-            docToEdit.DocumentNode.ChildNodes.Add(cssNode);
-
             WrapTextInSpan(descendantsOriginal, docToEdit);
 
-            int descendantsCount = descendantsToEdit.Count();
             foreach (var tag in tags)
             {
                 int i = 0;
                 List<HtmlNode> addedForSelection = new();
-                while (i < descendantsCount)
+                while (i < descendantsToEdit.Count())
                 {
-                    for (; i < descendantsCount; i++)
+                    for (; i < descendantsToEdit.Count(); i++)
                     {
                         var node = descendantsToEdit.ElementAt(i);
                         if (!node.Name.Contains("#text") || addedForSelection.Contains(node) || addedForSelection.Contains(node.ParentNode) ||
@@ -187 +183 @@
                             continue;
                         }
 
-                        var start = TagStartPositions[node.ParentNode.GetAttributeValue(TAG_ID_ATTRIBUTE_NAME, -1)];
-                        var end = TagClosingPositions[node.ParentNode.GetAttributeValue(TAG_ID_ATTRIBUTE_NAME, -1)];
+                        int nodeId = node.ParentNode.GetAttributeValue(TAG_ID_ATTRIBUTE_NAME, -1);
+
+                        var start = TagStartPositions[nodeId] + TagStartLengths[nodeId];
+                        var end = TagClosingPositions[nodeId];
 
                         int selectionStart = tag.Position;
                         int selectionEnd = tag.Position + tag.Length;
@@ -223 +221 @@
             sanitizer.AllowedAttributes.Clear();
             sanitizer.AllowedAttributes.Add(TAG_ID_ATTRIBUTE_NAME);
             sanitizer.AllowedAttributes.Add(TAG_INSTANCE_ATTRIBUTE_NAME);
+            sanitizer.AllowedAttributes.Add("end");
+            sanitizer.AllowedAttributes.Add("start");
+            sanitizer.AllowedAttributes.Add("class");
             if (sanitizer.AllowedTags.Contains("script"))
             {
                 sanitizer.AllowedTags.Remove("script");
+            }   
+            if (!sanitizer.AllowedTags.Contains("style"))
+            {
+                sanitizer.AllowedTags.Add("style");
             }
-
             docToRender = sanitizer.Sanitize(docToRender);
 
-            return docToRender;
+            HtmlDocument doc = new HtmlDocument();
+            doc.LoadHtml(docToRender);
+            var cssNode = GenerateCSS(doc, tags, new());
+            doc.DocumentNode.ChildNodes.Insert(0, cssNode);
+
+            return doc.DocumentNode.OuterHtml;
         }
 
         private HtmlNode SolveFullFill(HtmlNode node, int selectionStart, int selectionEnd, int start, int end, HtmlDocument docToEdit, AnnotationTag tag)
@@ -443 +452 @@
             inner += "span {line-height: 30px}\n";
 
             // TODO temporary
-            int lastPadding = 1;
+            int lastPadding = 0;
             foreach (var tag in tags)
             {
-                inner += $"span[{TAG_INSTANCE_ATTRIBUTE_NAME}=\"{tag.Instance}\"] {{ border-color:{tag.Tag.Color}; padding-bottom: {lastPadding}px }}";
+                inner += $"span[{TAG_INSTANCE_ATTRIBUTE_NAME}=\"{tag.Instance}\"] {{ border-color:{tag.Tag.Color}; padding-bottom: {lastPadding % 5}px }}";
                 lastPadding += 2;
             }
 

webapp/components/annotation/DocumentAnnotationView.tsx

@@ -10 +10 @@
     const { annotation } = useContext(AnnotationContext);
 
     if (!annotation) {
-        return <p>Došlo k chybě. Anotace nebyla nalezena</p>;
+        return <p>Probíhá načítání anotace ...</p>;
     }
 
     return (