From 2a7d26ef30e8c5f5706c984accf7979e39993d6d Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 14 Aug 2017 16:35:32 -0400 Subject: [PATCH 1/7] Seperate the input in generate report function from the parsing of the file --- bpeng/reports/cbra_diag.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bpeng/reports/cbra_diag.py b/bpeng/reports/cbra_diag.py index f2b181a..f067da7 100644 --- a/bpeng/reports/cbra_diag.py +++ b/bpeng/reports/cbra_diag.py @@ -400,6 +400,14 @@ class CbraDiagnostic: """ template_file = input('Enter Template Name (with .pptx extension): ') file_name = input('Enter File Name (with .xlsx extension): ') + project_address, diag_rep = CBRADiagnostic.generate_report_from_file(template_file, file_name) + diag_rep.save('EEDR {}.pptx'.format(project_address)) + print('Report generated!') + + def generate_report_from_file(template_file, report_file): + """ + Generate a report from the inputted file + """ file_input = pd.ExcelFile(file_name) sheet_input = file_input.parse("Inputs", header=None) ( @@ -408,15 +416,13 @@ class CbraDiagnostic: heat_loss_data, retrofit_data ) = CbraDiagnostic.parse_arguments(sheet_input) - project_address, diag_rep = CbraDiagnostic._generate_report( + return CbraDiagnostic._generate_report( template_file, project_summary_data, util_break_data, heat_loss_data, retrofit_data, ) - diag_rep.save('EEDR {}.pptx'.format(project_address)) - print('Report generated!') @staticmethod def parse_arguments(sheet_input): -- GitLab From d23d85283a55cbaef8f1922952d08497c927a3c4 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 14 Aug 2017 16:50:25 -0400 Subject: [PATCH 2/7] Fix pylint errors --- bpeng/reports/cbra_diag.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bpeng/reports/cbra_diag.py b/bpeng/reports/cbra_diag.py index f067da7..50a92db 100644 --- a/bpeng/reports/cbra_diag.py +++ b/bpeng/reports/cbra_diag.py @@ -404,19 +404,20 @@ class CbraDiagnostic: diag_rep.save('EEDR {}.pptx'.format(project_address)) print('Report generated!') + @staticmethod def generate_report_from_file(template_file, report_file): """ Generate a report from the inputted file """ - file_input = pd.ExcelFile(file_name) + file_input = pd.ExcelFile(template_file) sheet_input = file_input.parse("Inputs", header=None) ( project_summary_data, util_break_data, heat_loss_data, retrofit_data - ) = CbraDiagnostic.parse_arguments(sheet_input) - return CbraDiagnostic._generate_report( + ) = CBRADiagnostic.parse_arguments(sheet_input) + return CBRADiagnostic._generate_report( template_file, project_summary_data, util_break_data, -- GitLab From c8ae484e9bc8e7b7af5a417abf0c51fa5457f0e4 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 14 Aug 2017 21:58:30 -0400 Subject: [PATCH 3/7] Return Cbra to camel case --- bpeng/reports/cbra_diag.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpeng/reports/cbra_diag.py b/bpeng/reports/cbra_diag.py index 50a92db..f8ae74d 100644 --- a/bpeng/reports/cbra_diag.py +++ b/bpeng/reports/cbra_diag.py @@ -400,7 +400,7 @@ class CbraDiagnostic: """ template_file = input('Enter Template Name (with .pptx extension): ') file_name = input('Enter File Name (with .xlsx extension): ') - project_address, diag_rep = CBRADiagnostic.generate_report_from_file(template_file, file_name) + project_address, diag_rep = CbraDiagnostic.generate_report_from_file(template_file, file_name) diag_rep.save('EEDR {}.pptx'.format(project_address)) print('Report generated!') @@ -416,8 +416,8 @@ class CbraDiagnostic: util_break_data, heat_loss_data, retrofit_data - ) = CBRADiagnostic.parse_arguments(sheet_input) - return CBRADiagnostic._generate_report( + ) = CbraDiagnostic.parse_arguments(sheet_input) + return CbraDiagnostic._generate_report( template_file, project_summary_data, util_break_data, -- GitLab From 08ee5eca6f5da39083a38031163edf85f3361583 Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 15 Aug 2017 13:32:56 -0400 Subject: [PATCH 4/7] Use the report file not the template file --- bpeng/reports/cbra_diag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bpeng/reports/cbra_diag.py b/bpeng/reports/cbra_diag.py index f8ae74d..7ce9fef 100644 --- a/bpeng/reports/cbra_diag.py +++ b/bpeng/reports/cbra_diag.py @@ -409,7 +409,7 @@ class CbraDiagnostic: """ Generate a report from the inputted file """ - file_input = pd.ExcelFile(template_file) + file_input = pd.ExcelFile(report_file) sheet_input = file_input.parse("Inputs", header=None) ( project_summary_data, -- GitLab From e768246eb82599e203618989b28c0f588a5abafd Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 15 Aug 2017 14:43:20 -0400 Subject: [PATCH 5/7] Seperate function in customer pns file --- bpeng/reports/customer_pns.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bpeng/reports/customer_pns.py b/bpeng/reports/customer_pns.py index 2faaf47..8685240 100644 --- a/bpeng/reports/customer_pns.py +++ b/bpeng/reports/customer_pns.py @@ -464,6 +464,14 @@ class CustomerPns: """ template_file = 'PNS_SlideDeck.pptx' # TODO: input('Enter Template Name (with .pptx extension): ') file_name = input('Enter PNS file name (with .xlsx extension): ') + project_address, client_pns = CustomerPns.generate_pns_from_file( + template_file, + file_name, + ) + client_pns.save('PNS {}.pptx'.format(project_address)) + + @staticmethod + def generate_pns_from_file(template_file, file_name): file_input = pd.ExcelFile(file_name) sheet_input = file_input.parse("Inputs", header=None) ( @@ -471,13 +479,13 @@ class CustomerPns: building_information_data, retrofit_data ) = CustomerPns.parse_arguments(sheet_input) - project_address, client_pns = CustomerPns._generate_report( + return CustomerPns._generate_report( template_file, project_summary_data, building_information_data, retrofit_data, ) - client_pns.save('PNS {}.pptx'.format(project_address)) + @staticmethod def parse_arguments(sheet_input): -- GitLab From f451808422a6710afd81a28e407bb96f738705d2 Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 15 Aug 2017 14:46:50 -0400 Subject: [PATCH 6/7] Add customer pns to __init__ file --- bpeng/reports/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bpeng/reports/__init__.py b/bpeng/reports/__init__.py index 7bf4756..1d3fb32 100644 --- a/bpeng/reports/__init__.py +++ b/bpeng/reports/__init__.py @@ -1 +1,2 @@ from .cbra_diag import CbraDiagnostic +from .customer_pns import CustomerPns -- GitLab From 871644c1ff6ad7cc6210763309a0d649981b661c Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 15 Aug 2017 16:05:19 -0400 Subject: [PATCH 7/7] Bump version --- bpeng/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bpeng/__init__.py b/bpeng/__init__.py index 8d41ece..ac45176 100644 --- a/bpeng/__init__.py +++ b/bpeng/__init__.py @@ -4,4 +4,4 @@ BlocPower Engine library. Engineering and Financial modeling. """ -__version__ = '0.4.0' +__version__ = '0.4.1' -- GitLab