Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Cell level control for Table Borders #1285

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Kaustbh
Copy link

@Kaustbh Kaustbh commented Oct 15, 2024

Fixes : #1192

Implemented a new feature that allows granular, cell-level control over table borders. With this update, users can now define specific borders (left, right, top, bottom) for individual cells, offering greater customization when generating tables in PDFs.

Checklist:

  • The GitHub pipeline is OK (green),
    meaning that both pylint (static code analyzer) and black (code formatter) are happy with the changes of this PR.

  • A unit test is covering the code added / modified by this PR

  • This PR is ready to be merged

  • In case of a new feature, docstrings have been added, with also some documentation in the docs/ folder

  • A mention of the change is present in CHANGELOG.md

By submitting this pull request, I confirm that my contribution is made under the terms of the GNU LGPL 3.0 license.

@Kaustbh
Copy link
Author

Kaustbh commented Oct 15, 2024

Hi @Lucas-C, I have made a PR to know if I am doing it correctly it is not a complete implementation, please see the code change and give me suggestions.

fpdf/table.py Outdated Show resolved Hide resolved
fpdf/table.py Outdated Show resolved Hide resolved
def get_cell_border(self, i, j, cell):
"""
Defines which cell borders should be drawn.
Returns a string containing some or all of the letters L/R/T/B,
to be passed to `fpdf.FPDF.multi_cell()`.
Can be overriden to customize this logic
"""

if hasattr(cell, "border"):
border = CellBordersLayout.coerce(cell.border)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed if you perform the call to .coerce() in Row.cell()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think that those hasattr & CellBordersLayout.coerce calls are needed.

fpdf/table.py Outdated Show resolved Hide resolved
@Lucas-C
Copy link
Member

Lucas-C commented Oct 16, 2024

Hi @Lucas-C, I have made a PR to know if I am doing it correctly it is not a complete implementation, please see the code change and give me suggestions.

Nice, thank you for creating a PR 🙂

I made a few comments.

One thing that should come next is to add unit tests! 🙂

@Kaustbh
Copy link
Author

Kaustbh commented Oct 19, 2024

Hi, I made the suggested changes, now how can I fix this pylint warning,
fpdf/table.py:255:4: R0911: Too many return statements (7/6) (too-many-return-statements)
which is caused because of additional return str(border).

And please tell me where I should add the unit tests.

@Lucas-C
Copy link
Member

Lucas-C commented Oct 21, 2024

Hi, I made the suggested changes, now how can I fix this pylint warning, fpdf/table.py:255:4: R0911: Too many return statements (7/6) (too-many-return-statements) which is caused because of additional return str(border).

It now seems to be passing, but you have however 27 failing tests.

And please tell me where I should add the unit tests.

You can add them to test/table/test_table.py.

@Kaustbh
Copy link
Author

Kaustbh commented Oct 24, 2024

Hi @Lucas-C, should I write test just like this? and for all the different values like, right, top, etc.

def test_cell_border_left(tmp_path):
    pdf = FPDF()
    pdf.add_page()
    pdf.set_font("Times", size=5)
    with pdf.table( gutter_height=2, gutter_width=2) as table:

        for data_row in TABLE_DATA:
            row = table.row()
            for datum in data_row:
                row.cell(datum,border="left")
    assert_pdf_equal(pdf, HERE / "test_cell_border_left.pdf", tmp_path)

@Kaustbh
Copy link
Author

Kaustbh commented Oct 26, 2024

@Lucas-C is it the right way of writing the tests?

@Lucas-C
Copy link
Member

Lucas-C commented Oct 26, 2024

Hi @Lucas-C, should I write test just like this? and for all the different values like, right, top, etc.

Yes, this look likes a good start 👍
As mentioned on https://py-pdf.github.io/fpdf2/Development.html, you can pass generate=True once to assert_pdf_equal() in order to generate a reference PDF file.

And testing many possible combination of values is also a good idea!

@Kaustbh
Copy link
Author

Kaustbh commented Oct 27, 2024

is it fine @Lucas-C ?

@Kaustbh Kaustbh requested a review from Lucas-C October 28, 2024 17:01
@@ -362,3 +361,239 @@ def test_cell_speed_with_long_text(): # issue #907
assert len(LONG_TEXT_LINES) == 26862
for line in LONG_TEXT_LINES:
pdf.cell(0, 3, line, new_x="LMARGIN", new_y="NEXT")


def test_cell_border_none(tmp_path):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you regroup all or most of those tests in a single one, with one case per page, in order to limit the number of reference PDF files, please?

All the right/left/top/bottom cases could form a single unit test I think.

inherit should have its own dedicated unit test & reference file, but I think more cases should be tested:

  • cell border="INHERIT" with various table borders_layout values
  • cell border="INHERIT" with table outer_border_width set

Copy link
Member

@Lucas-C Lucas-C left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it fine @Lucas-C ?

There are a couple of minor things remaining to be fixed, and also could you please add a mention of this addition in the CHANGELOG.md file?

The I'll be happy to merge your PR 👍 🙂

@Kaustbh
Copy link
Author

Kaustbh commented Nov 1, 2024

Hi @Lucas-C,

Should I add documentation for this as well, or would it be better to address it in a new issue? Creating a separate issue might also be a good idea, as it would give me the opportunity to make an additional contribution 🙂

@Lucas-C
Copy link
Member

Lucas-C commented Nov 1, 2024

Should I add documentation for this as well, or would it be better to address it in a new issue? Creating a separate issue might also be a good idea, as it would give me the opportunity to make an additional contribution 🙂

We usually integrate the documentation related to new features as part of the PR that introduced it, so yes, it would be a good idea to include some documentation as part of this PR 🙂

Also, have you seen my other previous comments regarding the remaing minor changes required?

@Kaustbh
Copy link
Author

Kaustbh commented Nov 1, 2024

Yes, I have made the changes you suggested.

@Lucas-C
Copy link
Member

Lucas-C commented Nov 1, 2024

Yes, I have made the changes you suggested.

I'm sorry but I don't think you adressed those 4 distinct points:

also could you please add a mention of this addition in the CHANGELOG.md file?

We usually integrate the documentation related to new features as part of the PR that introduced it, so yes, it would be a good idea to include some documentation as part of this PR 🙂

@Kaustbh
Copy link
Author

Kaustbh commented Nov 1, 2024

I haven't committed it yet.

@Lucas-C
Copy link
Member

Lucas-C commented Nov 1, 2024

I haven't committed it yet.

Oh OK, alright, that's fine🙂
Take your time 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Cell Level Controll for Table Borders
2 participants