Revize f260dac8

Fixed issues in AnnotationService and HTMLService

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -224 +224 @@
                 {
                     if (annotation.ModifiedType == EModified.ADDED)
                     {
-                        var lastModifiedTag = context.AnnotationTags.Where(at => at.Id == annotation.LastModifiedTagId).First();
+
+                        AnnotationTagGeneric lastModifiedTag = isFinal ? context.FinalAnnotationTags.Where(at => at.Id == annotation.LastModifiedTagId).First() : 
+                            context.AnnotationTags.Where(at => at.Id == annotation.LastModifiedTagId).First();
+
                         var result = htmlService.PartialPreprocessHTMLAddTag(docToRender, documentContent.Content, lastModifiedTag, tags, cachedInfoToReturn);
                         docToRender = result.Item1;
                         cachedInfoToReturn = result.Item2;
@@ -315 +318 @@
                     Length = request.Length,
                     Position = request.Position,
                     SelectedText = request.SelectedText,
-                    Note = ""
+                    Note = "",
+                    IsFinal = true
                 };
             }
             else
@@ -754 +758 @@
 
             return true;
         }
+
+        public void SetTagIsFinal(Guid annotationId, Guid occurenceId, bool isFinal)
+        {
+            Annotation annotation;
+            try
+            {
+                annotation = context.FinalAnnotations.Single(fa => fa.Id == annotationId);
+            }
+            catch (Exception)
+            {
+                throw new InvalidOperationException("Annotation not found");
+            }
+
+            FinalAnnotationTag finalTagInstance;
+            try
+            {
+                finalTagInstance = context.FinalAnnotationTags.Single(fat => fat.Id == occurenceId);
+            }
+            catch (Exception)
+            {
+                throw new InvalidOperationException("Tag instance not found");
+            }
+
+            finalTagInstance.IsFinal = isFinal;
+
+            context.SaveChanges();
+        }
     }
 }

Backend/Core/Services/HTMLService/HTMLService.cs

@@ -452 +452 @@
          *      Partial HTML Preprocessing ----------------------------------------------------------------------------
          */
 
-        public (string, CachedInfo) PartialPreprocessHTMLAddTag(string htmlToEdit, string htmlOriginal, AnnotationTag tagToAdd, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo)
+        public (string, CachedInfo) PartialPreprocessHTMLAddTag(string htmlToEdit, string htmlOriginal, AnnotationTagGeneric tagToAdd, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo)
         {
             UnpackCachedInfo(cachedInfo);
 
@@ -524 +524 @@
         }
 
 
-        public (string, CachedInfo) PartialPreprocessHTMLRemoveTag(string htmlToEdit, string htmlOriginal, AnnotationTag tagToRemove, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo)
+        public (string, CachedInfo) PartialPreprocessHTMLRemoveTag(string htmlToEdit, string htmlOriginal, AnnotationTagGeneric tagToRemove, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo)
         {
             UnpackCachedInfo(cachedInfo);
 

Backend/Core/Services/HTMLService/IHTMLService.cs

@@ -11 +11 @@
     public interface IHTMLService
     {
         public (string, CachedInfo) FullPreprocessHTML(string htmlSource, List<AnnotationTagGeneric> tags);
-        public (string, CachedInfo) PartialPreprocessHTMLAddTag(string htmlToEdit, string htmlOriginal, AnnotationTag tagToAdd, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo);
-        public (string, CachedInfo) PartialPreprocessHTMLRemoveTag(string htmlToEdit, string htmlOriginal, AnnotationTag tagToRemove, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo);
+        public (string, CachedInfo) PartialPreprocessHTMLAddTag(string htmlToEdit, string htmlOriginal, AnnotationTagGeneric tagToAdd, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo);
+        public (string, CachedInfo) PartialPreprocessHTMLRemoveTag(string htmlToEdit, string htmlOriginal, AnnotationTagGeneric tagToRemove, List<AnnotationTagGeneric> tags, CachedInfo cachedInfo);
     }
 }