From 5d5085350812139c21fe8209a12653992bc93b06 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Wed, 3 Feb 2021 03:09:26 +0500 Subject: [PATCH 1/5] num format --- lib/elixlsx/xml_templates.ex | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/elixlsx/xml_templates.ex b/lib/elixlsx/xml_templates.ex index 323d821..c45c54c 100644 --- a/lib/elixlsx/xml_templates.ex +++ b/lib/elixlsx/xml_templates.ex @@ -573,10 +573,11 @@ defmodule Elixlsx.XMLTemplates do do: 0, else: FillDB.get_id(wci.filldb, style.fill) - numfmtid = - if is_nil(style.numfmt), - do: 0, - else: NumFmtDB.get_id(wci.numfmtdb, style.numfmt) + numfmtid = case style.numfmt do + nil -> 0 + %{format: "# ##0.00"} -> 4 + f -> NumFmtDB.get_id wci.numfmtdb, f + end borderid = if is_nil(style.border), From b9c0559c6a61ec90d94bd6fe948bc76f94b7560d Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Wed, 14 Apr 2021 15:55:21 +0300 Subject: [PATCH 2/5] hide zeros --- lib/elixlsx/xml_templates.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/elixlsx/xml_templates.ex b/lib/elixlsx/xml_templates.ex index c45c54c..b60934a 100644 --- a/lib/elixlsx/xml_templates.ex +++ b/lib/elixlsx/xml_templates.ex @@ -447,7 +447,7 @@ defmodule Elixlsx.XMLTemplates do - make_sheet_show_grid(sheet) <> """ From cb8b9ac34cb546539cc6e9dd9f36a3b1d1910cd8 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Sun, 18 Apr 2021 11:59:32 +0300 Subject: [PATCH 3/5] Sheet.show_zeros, default false --- lib/elixlsx/sheet.ex | 3 ++- lib/elixlsx/xml_templates.ex | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/elixlsx/sheet.ex b/lib/elixlsx/sheet.ex index a426991..963d995 100644 --- a/lib/elixlsx/sheet.ex +++ b/lib/elixlsx/sheet.ex @@ -25,7 +25,8 @@ defmodule Elixlsx.Sheet do group_rows: [], merge_cells: [], pane_freeze: nil, - show_grid_lines: true + show_grid_lines: true, + show_zeros: false @type t :: %Sheet{ name: String.t(), diff --git a/lib/elixlsx/xml_templates.ex b/lib/elixlsx/xml_templates.ex index b60934a..eea3e79 100644 --- a/lib/elixlsx/xml_templates.ex +++ b/lib/elixlsx/xml_templates.ex @@ -447,9 +447,10 @@ defmodule Elixlsx.XMLTemplates do - make_sheet_show_grid(sheet) <> + make_sheet_show_zeros(sheet) <> """ > """ <> @@ -488,6 +489,13 @@ defmodule Elixlsx.XMLTemplates do show_grid_lines_xml end + defp make_sheet_show_zeros(sheet) do + case sheet.show_zeros do + true -> "" + false -> ~s[ showZeros="0" ] + end + end + defp make_sheetview(sheet) do # according to spec: # * when only horizontal split is applied we need to use bottomLeft From 2c187d31f99a3471b232bf8781e51ce69f2d78df Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Mon, 19 Apr 2021 20:30:43 +0300 Subject: [PATCH 4/5] fit to page --- lib/elixlsx/sheet.ex | 3 ++- lib/elixlsx/xml_templates.ex | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/elixlsx/sheet.ex b/lib/elixlsx/sheet.ex index 963d995..c461889 100644 --- a/lib/elixlsx/sheet.ex +++ b/lib/elixlsx/sheet.ex @@ -26,7 +26,8 @@ defmodule Elixlsx.Sheet do merge_cells: [], pane_freeze: nil, show_grid_lines: true, - show_zeros: false + show_zeros: false, + fit_to_page: false @type t :: %Sheet{ name: String.t(), diff --git a/lib/elixlsx/xml_templates.ex b/lib/elixlsx/xml_templates.ex index eea3e79..bad5e34 100644 --- a/lib/elixlsx/xml_templates.ex +++ b/lib/elixlsx/xml_templates.ex @@ -439,11 +439,11 @@ defmodule Elixlsx.XMLTemplates do def make_sheet(sheet, wci) do grouping_info = get_grouping_info(sheet.group_rows) - ~S""" + ~s""" - + @@ -496,6 +496,13 @@ defmodule Elixlsx.XMLTemplates do end end + defp make_sheet_fit_to_page(sheet) do + case sheet.fit_to_page do + true -> "1" + _ -> "false" + end + end + defp make_sheetview(sheet) do # according to spec: # * when only horizontal split is applied we need to use bottomLeft From 3df8de45ea67ff5a9f7133b74060489954737866 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Sun, 16 May 2021 23:53:19 +0500 Subject: [PATCH 5/5] conversation 1 --- lib/elixlsx/xml_templates.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/elixlsx/xml_templates.ex b/lib/elixlsx/xml_templates.ex index bad5e34..12c6625 100644 --- a/lib/elixlsx/xml_templates.ex +++ b/lib/elixlsx/xml_templates.ex @@ -499,7 +499,7 @@ defmodule Elixlsx.XMLTemplates do defp make_sheet_fit_to_page(sheet) do case sheet.fit_to_page do true -> "1" - _ -> "false" + _ -> "0" end end