X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/7067975b593ef6a8b639f61dda710b023ec26a25..54b1f74ff185bceca625df43ecfd0148d181b34c:/src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index a3878c5..e636bb2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,20 +9,18 @@ const HEADER: &str = "<!DOCTYPE html>
   <meta charset=\"utf-8\">
   <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
   <style>
+    td { text-align: center; }
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
     table { border-collapse: collapse }
-    tr.key > th { height: 8em; vertical-align: bottom; line-height: 1 }
+    tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
     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.spacer { border: none; }
+    td.yes { border: thin solid gray; background-color: #ddd; }
     /* 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; }
-    img { height: 1.2em; }
   </style>
   <script>
     function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   \"highlight\"); } }
@@ -140,7 +138,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
         .into_iter()
         .map(|(col, n)| (n, col))
         .collect();
-    counts.sort();
+    counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
 fn column_order(rows: &[RowInput]) -> Vec<String> {
@@ -152,13 +150,14 @@ fn column_order(rows: &[RowInput]) -> Vec<String> {
 
 fn render_instance(entry: &Entry) -> String {
     match &entry.instance {
-        None => String::from("â "),
-        Some(instance) => String::from(instance) + " ",
+        None => String::from("â"),
+        Some(instance) => String::from(instance),
     }
 }
 
 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());
@@ -170,17 +169,18 @@ fn render_cell(col: &str, row: &RowInput) -> String {
         entries
             .iter()
             .map(|i| render_instance(i))
-            .collect::<String>()
+            .collect::<Vec<_>>()
+            .join(" ")
     };
-    format!("<td class=\"{class}\">{}</td>", contents.trim())
+    format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col}')\" onmouseout=\"ch2('{row_label}','{col}')\">{contents}</td>")
 }
 
 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))
@@ -190,12 +190,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>")
+    String::from("<tr class=\"key\"><th></th>")
         + &columns.iter().fold(String::new(), |mut acc, c| {
-            write!(&mut acc, "<th>{c}</th>").unwrap();
+            write!(&mut acc, "<th id=\"{c}\"><div><div>{c}</div></div></th>").unwrap();
             acc
         })
-        + "\n"
+        + "</tr>\n"
 }
 
 /// # Errors
@@ -355,7 +355,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
@@ -363,7 +363,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
@@ -371,7 +371,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
     }
 
@@ -385,7 +385,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(
@@ -395,7 +395,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(
@@ -405,7 +405,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(
@@ -415,7 +415,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(
@@ -425,7 +425,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(
@@ -435,7 +435,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>")
         );
     }
 }
