Merge branch 'main' into worktree-improvise-ewi-formula-crate
This commit is contained in:
@ -222,7 +222,8 @@ impl ImportPipeline {
|
||||
if let Some(val) = map.get(&measure.field).and_then(|v| v.as_f64()) {
|
||||
let mut cell_coords = coords.clone();
|
||||
cell_coords.push(("_Measure".to_string(), measure.field.clone()));
|
||||
wb.model.set_cell(CellKey::new(cell_coords), CellValue::Number(val));
|
||||
wb.model
|
||||
.set_cell(CellKey::new(cell_coords), CellValue::Number(val));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1112,6 +1113,9 @@ mod tests {
|
||||
("Date_Month".to_string(), "2026-03".to_string()),
|
||||
("_Measure".to_string(), "Amount".to_string()),
|
||||
]);
|
||||
assert_eq!(wb.model.get_cell(&key).and_then(|v| v.as_f64()), Some(100.0));
|
||||
assert_eq!(
|
||||
wb.model.get_cell(&key).and_then(|v| v.as_f64()),
|
||||
Some(100.0)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -578,11 +578,7 @@ fn coord_str(key: &CellKey) -> String {
|
||||
.join(", ")
|
||||
}
|
||||
|
||||
pub fn export_csv(
|
||||
workbook: &Workbook,
|
||||
view_name: &str,
|
||||
path: &Path,
|
||||
) -> Result<()> {
|
||||
pub fn export_csv(workbook: &Workbook, view_name: &str, path: &Path) -> Result<()> {
|
||||
let view = workbook
|
||||
.views
|
||||
.get(view_name)
|
||||
@ -1429,10 +1425,7 @@ Type=Food = 42
|
||||
fn category_name_with_comma_space_in_data() {
|
||||
let mut m = Workbook::new("Test");
|
||||
m.add_category("Income, Gross").unwrap();
|
||||
m.model
|
||||
.category_mut("Income, Gross")
|
||||
.unwrap()
|
||||
.add_item("A");
|
||||
m.model.category_mut("Income, Gross").unwrap().add_item("A");
|
||||
m.add_category("Month").unwrap();
|
||||
m.model.category_mut("Month").unwrap().add_item("Jan");
|
||||
m.model.set_cell(
|
||||
@ -1602,8 +1595,7 @@ mod parser_prop_tests {
|
||||
for (i, value) in values.into_iter().enumerate() {
|
||||
let a = &items1[i % items1.len()];
|
||||
let b = &items2[i % items2.len()];
|
||||
m.model
|
||||
.set_cell(coord(&[("CatA", a), ("CatB", b)]), value);
|
||||
m.model.set_cell(coord(&[("CatA", a), ("CatB", b)]), value);
|
||||
}
|
||||
|
||||
m
|
||||
|
||||
Reference in New Issue
Block a user