X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/f8c2cab25a0438491b3bfd7cbdf1e5d78f8b40a7..ba61b04b47e497f8519eed53c78864c08bfc8669:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index 84cb336..70dfb52 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -311,18 +311,25 @@ fn render_instances(instances: &[Option]) -> HTML { ) } -fn render_cell(col: &str, row: &mut Row) -> HTML { +fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML { let row_label = HTML::escape(row.label.as_ref()); let col_label = HTML::escape(col); let instances: Option<&Vec>> = row.entries.get(col); - let class = HTML::from(if instances.is_none() { "" } else { "yes" }); + let is_empty = match instances { + None => true, + Some(is) => is.iter().all(|ins| match ins { + None => false, + Some(content) => content == "×", + }), + }; + let class = HTML::from(if is_empty { "" } else { r#" class="yes""# }); let contents = match instances { None => HTML::from(""), Some(is) => render_instances(is), }; row.entries.remove(col); HTML(format!( - r#"{contents}"# + r#"{contents}"# )) } @@ -363,14 +370,14 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM .iter() .map(|ocol| match ocol { Some(col) if config.hidden_columns.contains(col) => HTML::from(""), - Some(col) => render_cell(col, row), + Some(col) => render_cell(config, col, row), None => HTML::from(r#""#), }) .collect::(); let dynamic_cells = columns .iter() .filter(|&col| !config.hidden_columns.contains(col)) - .map(|col| render_cell(col, row)) + .map(|col| render_cell(config, col, row)) .collect::(); let leftovers = render_all_leftovers(config, row); HTML(format!( @@ -683,6 +690,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -690,11 +698,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -702,11 +711,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -719,6 +729,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -731,6 +742,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -746,6 +758,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -758,6 +771,20 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), + "foo", + &mut Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("×".to_owned())])]), + } + ), + HTML::from( + r#"×"# + ) + ); + assert_eq!( + render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -770,6 +797,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -788,11 +816,11 @@ mod tests { ]), }; assert_eq!(r.entries.len(), 2); - render_cell("foo", &mut r); + render_cell(&Config::default(), "foo", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("bar", &mut r); + render_cell(&Config::default(), "bar", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("baz", &mut r); + render_cell(&Config::default(), "baz", &mut r); assert_eq!(r.entries.len(), 0); } @@ -863,7 +891,7 @@ mod tests { }) ), HTML::from( - r#"nopebar + r#"nopebar "# ) );