Implemented an invoice to export prepay groups invoices as PDFs #143
+1,599
−90
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prepayments have been implemented by a new processor, `PrepaymentProcessor`. The full implementation for prepayments involved the following changes: - Several new columns names have been added to `invoices/invoice.py`, including column names for the prepay data files and for the exported invoices - Many invoices will now export with 4 new columns: `Prepaid Group Name`, `Prepaid Group Institution`, `Prepaid Group Balance`, `Prepaid Group Used` - 4 command line arguments have been added to `process_report.py`. 3 of them allows the user to pass in a local version of the prepay credits, contacts, and projects file. The last one (`—prepay-debits`) allows passing a local version of the prepay debits files, and defaults to fetching from s3 if not provided - A set of test cases have been added for `PrepaymentProcessor` Since the implementation of this feature required a lot of logic decisions (i.e What happens if a prepaid project is active, but has no funds?), below is (hopefully) an exhaustive list of code logic decisions that were made. These can also be inferred through the test cases. - Prepay projects listed in `prepaid_projects.csv` are identified by their project name, not project - allocation name - Attempting to process past invoices (“backprocessing”) may result in incorrect output due to the nature of the prepay debit ledger - While backprocessing is not supported for past months, processing the same invoice month twice will still return correct output. In this case, the month’s debit entry may be will be overwritten - Prepay balances can be used in the same month they are added. - The time range in which prepay projects are considered “active” includes their start and end date - After processing of any given invoice month, debit entries for that month will be added. I emphasize this for clarification. A debit entry such as: `2024-11,G1,1062.48` Should be interpreted as: In the period from 2024-11-01 to 2024-11-30, prepay group G1 spent $1062.48 As opposed to: In the period from 2024-10-01 to 2024-10-31, … - If prepay projects are “active” but their prepay group has $0 balance, their prepay info (group name, contact email) is still included, but the prepay balance will be displayed as $0 and the prepay used as an empty field
…r` to `util` Since these functions are now used in more than one location (`add_insti_proc` and `prepay_proc`), it makes sense for them to be relocated to `util` The test case checking institution-processing has changed slightly
The PI-specific dataframes will first be converted to HTML tables using Jinja templates, and then converted to PDFs using Chromium. Now, users of the script must provide a path to the Chromium/Chrome binary throught the env var `CHROME_BIN_PATH` A html template folder has been added, and the test cases for the PI-specific invoice will now both check whether the dataframe is formatted correctly and if the PDFs are correctly generated. The dockerfile has been to install chromium
larsks
requested changes
Jan 22, 2025
Comment on lines
+146
to
+175
| def _create_html_invoice(temp_fd): | ||
| environment = Environment(loader=FileSystemLoader(TEMPLATE_DIR_PATH)) | ||
| template = environment.get_template("pi_invoice.html") | ||
| content = template.render( | ||
| data=group_dataframe, | ||
| ) | ||
| temp_fd.write(content) | ||
| temp_fd.flush() | ||
|
|
||
| def _create_pdf_invoice(temp_fd_name): | ||
| chrome_binary_location = os.environ.get( | ||
| "CHROME_BIN_PATH", "usr/bin/chromium" | ||
| ) | ||
| if not os.path.exists(chrome_binary_location): | ||
| sys.exit( | ||
| f"Chrome binary does not exist at {chrome_binary_location}. Make sure the env var CHROME_BIN_PATH is set correctly or that Google Chrome is installed" | ||
| ) | ||
|
|
||
| invoice_pdf_path = f"{self.name}/{group_instituition}_{group_contact_email}_{self.invoice_month}.pdf" | ||
| subprocess.run( | ||
| [ | ||
| chrome_binary_location, | ||
| "--headless", | ||
| "--no-sandbox", | ||
| f"--print-to-pdf={invoice_pdf_path}", | ||
| "--no-pdf-header-footer", | ||
| "file://" + temp_fd_name, | ||
| ], | ||
| capture_output=True, | ||
| ) |
There was a problem hiding this comment.
This looks like a duplicate of the code in process_report/invoices/pi_specific_invoice.py. Can we factor this out into a common base class (or mixin)?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #137. This PR consists of the last commit. I feel like there is still a bit of polishing left to do, so I will submit this as a draft for now. I'll revisit this when #137 has been fully reviewed and merged.
The PR is quite similar to #137 in terms of logic, using the chromium library to generate the PDFs.