Merge pull request #2 from MyEMS/master

catch up with the main site.
pull/67/MERGE
Winnerineast Lee 2021-10-05 16:10:30 +08:00 committed by GitHub
commit 9a82cbb999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 466 additions and 565 deletions

View File

@ -6,16 +6,16 @@
<form role="form" name="form_user" novalidate class="form-horizontal"> <form role="form" name="form_user" novalidate class="form-horizontal">
<div class="form-group"><label class="col-sm-3 control-label">{{'USER.USERNAME' | translate}}</label> <div class="form-group"><label class="col-sm-3 control-label">{{'USER.USERNAME' | translate}}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input ng-model="user.name" type="text" name="username" class="form-control" ng-disabled="operation=='edit'" required> <input ng-model="user.name" type="text" name="username" class="form-control" ng-disabled="operation=='USER.EDIT_USER'" required>
<div class="m-t-xs" ng-show="form_user.username.$invalid && form_user.username.$dirty"> <div class="m-t-xs" ng-show="form_user.username.$invalid && form_user.username.$dirty">
<small class="text-danger" ng-show="form_user.username.$error.required">{{'USER.INPUT_NAME' | translate}}</small> <small class="text-danger" ng-show="form_user.username.$error.required">{{'USER.INPUT_NAME' | translate}}</small>
</div> </div>
</div> </div>
</div> </div>
<div class="hr-line-dashed" ng-hide="operation=='edit'"></div> <div class="hr-line-dashed" ng-hide="operation=='USER.EDIT_USER'"></div>
<div class="form-group" ng-hide="operation=='edit'"><label class="col-sm-3 control-label">{{'USER.PASSWORD' | translate}}</label> <div class="form-group" ng-hide="operation=='USER.EDIT_USER'"><label class="col-sm-3 control-label">{{'USER.PASSWORD' | translate}}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input ng-model="user.password" type="password" name="userpassword" class="form-control" ng-disabled="operation=='edit'"> <input ng-model="user.password" type="password" name="userpassword" class="form-control" ng-disabled="operation=='USER.EDIT_USER'">
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>

View File

@ -15,6 +15,7 @@ Providing database schema and scripts for MyEMS.
Execute the following scripts in MySQL commandline, or execute in other MySQL client tools such as MySQL Workbench, Navicat, DBaver, phpMyAdmin, etc. Here is [an example shell script](create_database_ubuntu.sh) to initiate database in one command on Ubuntu 20.04. Execute the following scripts in MySQL commandline, or execute in other MySQL client tools such as MySQL Workbench, Navicat, DBaver, phpMyAdmin, etc. Here is [an example shell script](create_database_ubuntu.sh) to initiate database in one command on Ubuntu 20.04.
```bash ```bash
cd myems/database/install
mysql -u root -p < myems_billing_baseline_db.sql mysql -u root -p < myems_billing_baseline_db.sql
mysql -u root -p < myems_billing_db.sql mysql -u root -p < myems_billing_db.sql
mysql -u root -p < myems_energy_baseline_db.sql mysql -u root -p < myems_energy_baseline_db.sql
@ -27,7 +28,8 @@ mysql -u root -p < myems_user_db.sql
``` ```
To insert demo data execute the following scripts, To insert demo data execute the following scripts,
```bash ```bash
mysql -u root -p < demo/myems_system_db.sql cd myems/database/demo
mysql -u root -p < myems_system_db.sql
``` ```
#### Change COLLATE for MySQL server before version 8.0 #### Change COLLATE for MySQL server before version 8.0
```bash ```bash

View File

@ -119,32 +119,30 @@ def generate_excel(report,
img = Image("excelexporters/myems.png") img = Image("excelexporters/myems.png")
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title=
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws.merge_cells("G3:H3") ws['D4'].alignment = b_r_alignment
ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -118,32 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period_efficiency" not in report.keys() or \ if "reporting_period_efficiency" not in report.keys() or \
"names" not in report['reporting_period_efficiency'].keys() or len( "names" not in report['reporting_period_efficiency'].keys() or len(

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -118,32 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -97,7 +97,7 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
@ -109,7 +109,7 @@ def generate_excel(report,
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -118,30 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -118,32 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws['G3'].border = b_border ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -98,19 +98,19 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -119,30 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -119,32 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -116,32 +116,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period_efficiency" not in report.keys() or \ if "reporting_period_efficiency" not in report.keys() or \
"names" not in report['reporting_period_efficiency'].keys() or len( "names" not in report['reporting_period_efficiency'].keys() or len(

View File

@ -119,32 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -116,32 +116,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -117,32 +117,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -95,7 +95,7 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
@ -107,7 +107,7 @@ def generate_excel(report,
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -116,30 +116,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -116,32 +116,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -118,32 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws['G3'].border = b_border ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -98,19 +98,19 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -119,30 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -73,13 +73,13 @@ def generate_excel(report, space_name):
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
for i in range(ord('B'), ord('F')): for i in range(ord('B'), ord('F')):

View File

@ -128,7 +128,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
ws['C5'].alignment = b_c_alignment ws['C5'].alignment = b_c_alignment
ws['C5'] = reporting_end_datetime_local ws['C5'] = reporting_end_datetime_local
# Title # Column Title
ws['B6'].border = f_border ws['B6'].border = f_border
ws['B6'].font = name_font ws['B6'].font = name_font
ws['B6'].alignment = c_c_alignment ws['B6'].alignment = c_c_alignment

View File

@ -113,32 +113,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

View File

@ -110,32 +110,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

View File

@ -109,31 +109,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws.merge_cells("G3:H3") ws['D4'].alignment = b_r_alignment
ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"difference_values" not in report['reporting_period'].keys() or \ "difference_values" not in report['reporting_period'].keys() or \

View File

@ -109,24 +109,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Space:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = space_name ws['C3'] = space_name
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['B5'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['B5'] = 'Reporting End Datetime:'
ws['C5'].border = b_border
ws['C5'].alignment = b_c_alignment
ws['C5'] = reporting_end_datetime_local
# Title # Title
ws['B6'].border = f_border ws['B6'].border = f_border

View File

@ -120,24 +120,23 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['B5'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['B5'] = 'Reporting End Datetime:'
ws['C5'].border = b_border
ws['C5'].alignment = b_c_alignment
ws['C5'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:
filename = str(uuid.uuid4()) + '.xlsx' filename = str(uuid.uuid4()) + '.xlsx'

View File

@ -112,32 +112,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

View File

@ -109,32 +109,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

View File

@ -120,8 +120,6 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border

View File

@ -98,19 +98,19 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)

View File

@ -99,7 +99,7 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
@ -111,7 +111,7 @@ def generate_excel(report,
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
# Img # Img
@ -119,32 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws.merge_cells("G3:I3") ws['C4'].alignment = b_c_alignment
for i in range(ord('G'), ord('I') + 1): ws['C4'] = reporting_start_datetime_local
ws[chr(i) + '3'].border = b_border
ws['G3'].alignment = b_c_alignment ws['D4'].alignment = b_r_alignment
ws['G3'].font = name_font ws['D4'] = 'Reporting End Datetime:'
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -117,32 +117,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -97,7 +97,7 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
@ -109,7 +109,7 @@ def generate_excel(report,
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -118,30 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws['G3'].border = b_border ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -97,7 +97,7 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
@ -109,7 +109,7 @@ def generate_excel(report,
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -118,30 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -110,14 +110,10 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Space:' ws['B3'] = 'Space:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = space_name ws['C3'] = space_name
ws['B4'].alignment = b_r_alignment ws['B4'].alignment = b_r_alignment

View File

@ -113,19 +113,19 @@ def generate_excel(report,
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_l_alignment = Alignment(vertical='bottom', b_l_alignment = Alignment(vertical='bottom',
horizontal='left', horizontal='left',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -150,7 +150,7 @@ def generate_excel(report,
if has_lease_number_data_flag: if has_lease_number_data_flag:
ws['B24'].font = name_font ws['B24'].font = name_font
ws['B24'].alignment = b_r_alignment ws['B24'].alignment = b_r_alignment
ws['B24'] = '租赁合同号码:' ws['B24'] = 'Lease Number:'
ws['C24'].alignment = b_l_alignment ws['C24'].alignment = b_l_alignment
ws['C24'].font = name_font ws['C24'].font = name_font
ws['C24'] = report['tenant']['lease_number'] ws['C24'] = report['tenant']['lease_number']

View File

@ -121,31 +121,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws.merge_cells("G3:H3") ws['D4'].alignment = b_r_alignment
ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -118,32 +118,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -116,31 +116,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].alignment = b_c_alignment ws['C4'].alignment = b_c_alignment
ws['G3'].font = name_font ws['C4'] = reporting_start_datetime_local
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
ws.merge_cells("G3:H3") ws['D4'].alignment = b_r_alignment
ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"timestamps" not in report['reporting_period'].keys() or len(report['reporting_period']['timestamps']) == 0: "timestamps" not in report['reporting_period'].keys() or len(report['reporting_period']['timestamps']) == 0:

View File

@ -120,32 +120,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -98,19 +98,19 @@ def generate_excel(report,
b_c_alignment = Alignment(vertical='bottom', b_c_alignment = Alignment(vertical='bottom',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
c_c_alignment = Alignment(vertical='center', c_c_alignment = Alignment(vertical='center',
horizontal='center', horizontal='center',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
b_r_alignment = Alignment(vertical='bottom', b_r_alignment = Alignment(vertical='bottom',
horizontal='right', horizontal='right',
text_rotation=0, text_rotation=0,
wrap_text=False, wrap_text=True,
shrink_to_fit=False, shrink_to_fit=False,
indent=0) indent=0)
@ -119,30 +119,29 @@ def generate_excel(report,
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:

View File

@ -112,32 +112,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws['G3'].border = b_border ws['C4'].alignment = b_c_alignment
ws['G3'].alignment = b_c_alignment ws['C4'] = reporting_start_datetime_local
ws['G3'].font = name_font
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'].alignment = b_r_alignment
ws.merge_cells("G3:H3") ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

View File

@ -108,32 +108,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws.add_image(img, 'A1') ws.add_image(img, 'A1')
# Title # Title
ws.row_dimensions[3].height = 60
ws['B3'].font = name_font
ws['B3'].alignment = b_r_alignment ws['B3'].alignment = b_r_alignment
ws['B3'] = 'Name:' ws['B3'] = 'Name:'
ws['C3'].border = b_border ws['C3'].border = b_border
ws['C3'].alignment = b_c_alignment ws['C3'].alignment = b_c_alignment
ws['C3'].font = name_font
ws['C3'] = name ws['C3'] = name
ws['D3'].font = name_font
ws['D3'].alignment = b_r_alignment ws['D3'].alignment = b_r_alignment
ws['D3'] = 'Period:' ws['D3'] = 'Period:'
ws['E3'].border = b_border ws['E3'].border = b_border
ws['E3'].alignment = b_c_alignment ws['E3'].alignment = b_c_alignment
ws['E3'].font = name_font
ws['E3'] = period_type ws['E3'] = period_type
ws['F3'].font = name_font ws['B4'].alignment = b_r_alignment
ws['F3'].alignment = b_r_alignment ws['B4'] = 'Reporting Start Datetime:'
ws['F3'] = 'Date:' ws['C4'].border = b_border
ws.merge_cells("G3:H3") ws['C4'].alignment = b_c_alignment
ws['G3'].border = b_border ws['C4'] = reporting_start_datetime_local
ws['G3'].alignment = b_c_alignment
ws['G3'].font = name_font ws['D4'].alignment = b_r_alignment
ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local ws['D4'] = 'Reporting End Datetime:'
ws['E4'].border = b_border
ws['E4'].alignment = b_c_alignment
ws['E4'] = reporting_end_datetime_local
if "reporting_period" not in report.keys() or \ if "reporting_period" not in report.keys() or \
"values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: