add html img tag generation

bjornregnell · bjornregnell · commit 31c4a109f01a · 2025-01-19T16:12:09.000+01:00
diff --git a/src/main/scala/05-HtmlGen.scala b/src/main/scala/05-HtmlGen.scala
@@ -65,27 +65,50 @@ object HtmlGen:
   def elemListItem(level: Int, cls: String = "")(et: ElemType)(after: String = ""): String = 
     ("  " * level) + s"""<li><span class="$cls"> $et</span>: $after </li>""" 
 
-  def renderHtmlBody(m: Model, level: Int): String = 
+  def renderHtmlBody(m: Model, level: Int, insertImagesWithLocation: Boolean, parent: Option[Ent]): String = 
     val ind = ("  " * level)
     val lines: Vector[String] = m.elems.map: 
       case Ent(t, id)        => elemListItem(level, "entityColor"   )(t)(id) 
-      case StrAttr(t, value) => elemListItem(level, "attributeColor")(t)(value)
+
+      case StrAttr(t, value) => 
+        val imgTag: String = 
+          parent.map: p => 
+            if p.t == Image && t == Location then 
+              "\n" + ("  " * level) + s"""<img src="$value" alt="${p.t}: ${p.id} has $t: $value" class="imageLocation">"""
+            else ""
+          .getOrElse("")
+
+        if imgTag.nonEmpty then imgTag
+        else elemListItem(level, "attributeColor")(t)(value) 
+      
       case IntAttr(t, value) => elemListItem(level, "attributeColor")(t)(value.toString)
+      
       case Undefined(t)      => elemListItem(level, "attributeColor")(t)("???")
+      
       case Rel(e, t, sub)    => 
-          s"""$ind<li><span class="entityColor"> ${e.t}</span>: ${e.id}""" 
-          + s"""<span class="relationColor"> ${t.show}</span></li>\n"""
-          + (if sub.elems.nonEmpty then renderHtmlBody(sub, level + 1) else "")
+        s"""$ind<li><span class="entityColor"> ${e.t}</span>: ${e.id}""" 
+        + s"""<span class="relationColor"> ${t.show}</span></li>\n"""
+        + (if sub.elems.nonEmpty then renderHtmlBody(sub, level + 1, insertImagesWithLocation, Some(e)) else "")
+    
     lines.mkString(s"$ind<ul>\n","\n",s"\n$ind</ul>")
+  end renderHtmlBody
 
   extension (m: Model) 
-    def toHtmlBody: String = 
+    def toHtml: String = toHtml()
+    def toHtmlBody: String = toHtmlBody()
+
+    def toHtmlBody(
+      insertImagesWithLocation: Boolean = true,
+    ): String = 
       if m.elems.isEmpty then "<ul><li>Empty Model</li></ul>"
-      else renderHtmlBody(m, 0)
+      else renderHtmlBody(m, 0, insertImagesWithLocation, parent = None)
 
-    def toHtml: String = toHtml()
 
-    def toHtml(fallBackTitle: String = defaultTitle, style: String = defaultStyle): String = 
+    def toHtml(
+      insertImagesWithLocation: Boolean = true, 
+      fallBackTitle: String = defaultTitle, 
+      style: String = defaultStyle,
+    ): String = 
       s"${preamble(m, fallBackTitle, style)}\n<body>\n${m.toHtmlBody}\n</body>\n</html>\n"
   
 end HtmlGen
diff --git a/src/test/scala/TestHtmlGen.scala b/src/test/scala/TestHtmlGen.scala
@@ -0,0 +1,16 @@
+package reqt
+
+class TestHtmlGen extends munit.FunSuite:
+  test("Model toHtml"):
+    import scala.sys.process._
+    val m = Model(
+      Section("ContextDiagram").has(
+        Product("x"),
+        Image("ctxDiagram") has Location("ctx.png"),
+      )
+    )
+    val html = m.toHtml
+    val f1 = "target/m1.html"
+    html.saveTo(f1)
+
+    assert(true)  // TODO check that it includes the right stuff
