Set ids, add divs & triggers to engage with the CSS & JS

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 5de1c121059ebbc4168a0b952d303fa195f1c4a1..2e9bfcc72adc364faf9bab51051b9988333cd302 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
  use std::collections::{HashMap, HashSet};
+use std::fmt::Write;
  use std::io::BufRead;
  use std::iter::Iterator;
  
@@ -17,7 +18,7 @@ const HEADER: &str = "<!DOCTYPE html>
      tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
      td { border: thin solid gray; }
      td.numeric { text-align: right; }
-    td.yes { border: thin solid gray; background-color: gray; }
+    td.yes { border: thin solid gray; background-color: #ddd; }
      td.spacer { border: none; }
      /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
      .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
@@ -158,6 +159,7 @@ fn render_instance(entry: &Entry) -> String {
  
  fn render_cell(col: &str, row: &RowInput) -> String {
      // TODO: Escape HTML special characters
+    let row_label = &row.label;
      let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect();
      let class = if entries.is_empty() { "" } else { "yes" };
      let all_empty = entries.iter().all(|e| e.instance.is_none());
@@ -171,15 +173,15 @@ fn render_cell(col: &str, row: &RowInput) -> String {
              .map(|i| render_instance(i))
              .collect::<String>()
      };
-    format!("<td class=\"{class}\">{}</td>", contents.trim())
+    format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col}')\" onmouseout=\"ch2('{row_label}','{col}')\">{}</td>", contents.trim())
  }
  
  fn render_row(columns: &[String], row: &RowInput) -> String {
      // This is O(n^2) & doesn't need to be
      // TODO: Escape HTML special characters
+    let row_label = &row.label;
      format!(
-        "<tr><th>{}</th>{}</tr>\n",
-        row.label,
+        "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
          &columns
              .iter()
              .map(|col| render_cell(col, row))
@@ -189,12 +191,12 @@ fn render_row(columns: &[String], row: &RowInput) -> String {
  
  fn render_column_headers(columns: &[String]) -> String {
      // TODO: Escape HTML special characters
-    String::from("<th></th>")
-        + &columns
-            .iter()
-            .map(|c| format!("<th>{c}</th>"))
-            .collect::<String>()
-        + "\n"
+    String::from("<tr class=\"key\"><th></th>")
+        + &columns.iter().fold(String::new(), |mut acc, c| {
+            write!(&mut acc, "<th id=\"{c}\"><div><div>{c}</div></div></th>").unwrap();
+            acc
+        })
+        + "</tr>\n"
  }
  
  /// # Errors
@@ -384,7 +386,7 @@ mod tests {
                      entries: vec![]
                  }
              ),
-            String::from("<td class=\"\"></td>")
+            String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
          );
          assert_eq!(
              render_cell(
@@ -394,7 +396,7 @@ mod tests {
                      entries: vec![Entry::from("bar")]
                  }
              ),
-            String::from("<td class=\"\"></td>")
+            String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
          );
          assert_eq!(
              render_cell(
@@ -404,7 +406,7 @@ mod tests {
                      entries: vec![Entry::from("foo")]
                  }
              ),
-            String::from("<td class=\"yes\"></td>")
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
          );
          assert_eq!(
              render_cell(
@@ -414,7 +416,7 @@ mod tests {
                      entries: vec![Entry::from("foo"), Entry::from("foo")]
                  }
              ),
-            String::from("<td class=\"yes\">2</td>")
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
          );
          assert_eq!(
              render_cell(
@@ -424,7 +426,7 @@ mod tests {
                      entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
                  }
              ),
-            String::from("<td class=\"yes\">5 10</td>")
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
          );
          assert_eq!(
              render_cell(
@@ -434,7 +436,7 @@ mod tests {
                      entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
                  }
              ),
-            String::from("<td class=\"yes\">5 ✓</td>")
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 ✓</td>")
          );
      }
  }