diff --git a/README.md b/README.md
index 4a5efcf..69360d1 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
diff --git a/docs/.buildinfo b/docs/.buildinfo
index cd1de59..dfe68d7 100644
--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 588ef32e5d3380f257565ff4648d3b11
+config: 6df82cdb6e3ab70d022614431807b4e8
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/.doctrees/base_classes.doctree b/docs/.doctrees/base_classes.doctree
index 3dc2d1e..120c069 100644
Binary files a/docs/.doctrees/base_classes.doctree and b/docs/.doctrees/base_classes.doctree differ
diff --git a/docs/.doctrees/calculation_helpers.doctree b/docs/.doctrees/calculation_helpers.doctree
index 25c030c..2d50895 100644
Binary files a/docs/.doctrees/calculation_helpers.doctree and b/docs/.doctrees/calculation_helpers.doctree differ
diff --git a/docs/.doctrees/environment.pickle b/docs/.doctrees/environment.pickle
index eabed49..2292051 100644
Binary files a/docs/.doctrees/environment.pickle and b/docs/.doctrees/environment.pickle differ
diff --git a/docs/_sources/base_classes.rst.txt b/docs/_sources/base_classes.rst.txt
index 406713a..fe33d4b 100644
--- a/docs/_sources/base_classes.rst.txt
+++ b/docs/_sources/base_classes.rst.txt
@@ -31,6 +31,14 @@ Base Classes
:members:
+.. autoclass:: efficalc.Table
+ :members:
+
+
+.. autoclass:: efficalc.InputTable
+ :members:
+
+
.. autoclass:: efficalc.TextBlock
:members:
diff --git a/docs/_sources/calculation_helpers.rst.txt b/docs/_sources/calculation_helpers.rst.txt
index 9b95518..7d664c6 100644
--- a/docs/_sources/calculation_helpers.rst.txt
+++ b/docs/_sources/calculation_helpers.rst.txt
@@ -12,6 +12,10 @@ Calculation Helpers
:members:
+.. autoclass:: efficalc.report_builder.LongCalcDisplayType
+ :members:
+
+
.. autofunction:: efficalc.save_calculation_item
diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
index da41795..c8f2547 100644
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
- VERSION: '1.2.1',
+ VERSION: '1.2.3',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/docs/base_classes.html b/docs/base_classes.html
index 08f7bb9..e9570bb 100644
--- a/docs/base_classes.html
+++ b/docs/base_classes.html
@@ -6,7 +6,7 @@
Base Classes - efficalc 1.2.1 documentation
+ Base Classes - efficalc 1.2.3 documentation
Calculation Helpers - efficalc 1.2.1 documentation
+ Calculation Helpers - efficalc 1.2.3 documentation
Drawing on a Canvas - efficalc 1.2.1 documentation
+ Drawing on a Canvas - efficalc 1.2.3 documentation
Constants and Unit Conversions - efficalc 1.2.1 documentation
+ Constants and Unit Conversions - efficalc 1.2.3 documentation
Examples - efficalc 1.2.1 documentation
+ Examples - efficalc 1.2.3 documentation
Figures in Calc Reports - efficalc 1.2.1 documentation
+ Figures in Calc Reports - efficalc 1.2.3 documentation
Index - efficalc 1.2.1 documentation
+ Index - efficalc 1.2.3 documentation
Quickstart - efficalc 1.2.1 documentation
+ Quickstart - efficalc 1.2.3 documentation
efficalc 1.2.1 documentation
+ efficalc 1.2.3 documentation
Integrating and Extending efficalc - efficalc 1.2.1 documentation
+ Integrating and Extending efficalc - efficalc 1.2.3 documentation
Math Operations - efficalc 1.2.1 documentation
+ Math Operations - efficalc 1.2.3 documentation
Purpose and Background - efficalc 1.2.1 documentation
+ Purpose and Background - efficalc 1.2.3 documentation
Python Module Index - efficalc 1.2.1 documentation
+ Python Module Index - efficalc 1.2.3 documentation
Search - efficalc 1.2.1 documentation Search - efficalc 1.2.3 documentation Section Properties - efficalc 1.2.1 documentation
+ Section Properties - efficalc 1.2.3 documentation
Styling Reports - efficalc 1.2.1 documentation
+ Styling Reports - efficalc 1.2.3 documentation
Testing Your Calculations - efficalc 1.2.1 documentation
+ Testing Your Calculations - efficalc 1.2.3 documentation
{item.title} "
+ if item.numbered_rows:
+ table_html += "{header} "
table_html += " "
- for row in item.data:
+ for row_num, row in enumerate(item.data):
table_html += ""
+ if item.numbered_rows:
+ table_html += f"{row_num+1} "
for cell in row:
table_html += f"{cell} "
table_html += " "
@@ -314,8 +318,10 @@ def _wrap_with_reference(primary_content: str, reference: str | None) -> str:
"display: flex; flex-direction: column; justify-content: center;"
)
+ ref_only_styles = "margin-left:1rem;text-wrap:no-wrap;"
+
return _wrap_div(
- f"{_wrap_div(primary_content, vertical_justified)} {_wrap_div(ref, vertical_justified)}",
+ f"{_wrap_div(primary_content, vertical_justified)} {_wrap_div(ref, vertical_justified+ref_only_styles)}",
f"display:flex; flex-direction:row; justify-content:space-between; {CALC_MARGIN}",
)
diff --git a/pyproject.toml b/pyproject.toml
index 9781261..8d63a52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "efficalc"
-version = "1.2.1"
+version = "1.2.2"
authors = [
{ name="Andrew Young", email="youandvern@gmail.com" },
]
@@ -28,7 +28,7 @@ Documentation = "https://youandvern.github.io/efficalc"
Issues = "https://github.com/youandvern/efficalc/issues"
[tool.setuptools.packages]
-find = { include = ["efficalc", "efficalc.sections", "efficalc.base_definitions"] }
+find = { include = ["efficalc", "efficalc.sections", "efficalc.base_definitions", "efficalc.canvas"] }
[tool.setuptools]
package-data = {"efficalc.sections" = ["section_properties.db"]}
diff --git a/tests/base_definitions/test_table.py b/tests/base_definitions/test_table.py
index 755e608..8a95d39 100644
--- a/tests/base_definitions/test_table.py
+++ b/tests/base_definitions/test_table.py
@@ -26,6 +26,7 @@ def test_default_values(common_setup_teardown):
assert a.striped is False
assert a.full_width is False
assert a.result_check is False
+ assert a.numbered_rows is False
def test_set_values(common_setup_teardown):
@@ -36,6 +37,7 @@ def test_set_values(common_setup_teardown):
striped=True,
full_width=False,
result_check=True,
+ numbered_rows=True,
)
assert a.data == [[1, 2, 3, 4], [5, 6, 7, 8]]
assert a.headers == ["a", "b", "c", "d"]
@@ -43,6 +45,7 @@ def test_set_values(common_setup_teardown):
assert a.striped is True
assert a.full_width is False
assert a.result_check is True
+ assert a.numbered_rows is True
def test_save_calc_item(common_setup_teardown):
@@ -66,6 +69,7 @@ def test_input_table_set_values(common_setup_teardown):
title="my table",
striped=True,
full_width=False,
+ numbered_rows=True,
)
assert a.data == [[1, 2, 3, 4], [5, 6, 7, "test"]]
assert a.headers == ["a", "b", "c", "d"]
@@ -73,6 +77,7 @@ def test_input_table_set_values(common_setup_teardown):
assert a.striped is True
assert a.full_width is False
assert a.result_check is False
+ assert a.numbered_rows is True
def test_input_table_identifier(common_setup_teardown):
diff --git a/tests/test_generate_html.py b/tests/test_generate_html.py
index 10b3909..ae03b96 100644
--- a/tests/test_generate_html.py
+++ b/tests/test_generate_html.py
@@ -466,6 +466,7 @@ def test_table_with_all_styling(common_setup_teardown):
result = generate_html_for_calc_items([table])
assert '" in result
+ assert "1" not in result
def test_table_with_no_styling(common_setup_teardown):
@@ -475,6 +476,7 @@ def test_table_with_no_styling(common_setup_teardown):
''
in result
)
+ assert "1" not in result
def test_table_no_data(common_setup_teardown):
@@ -486,3 +488,29 @@ def test_table_no_data(common_setup_teardown):
"greeks numbers greeks numbers " in result
+ assert "1 f g 2 i " in result
+ assert "3 l " in result
+
+
+def test_table_with_row_numbers_without_headers(common_setup_teardown):
+ table = Table([["f"]], numbered_rows=True)
+
+ result = generate_html_for_calc_items([table])
+ assert "1 f " in result
+ assert "2" not in result
- 
+ 
- 
+ 
