Skip to content

Commit 1fd3c40

Browse files
committed
report title functionality restored
1 parent 3c4fa57 commit 1fd3c40

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

civet/command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def main(sysargs = sys.argv[1:]):
274274

275275
# Define what's going to go in the report and sort global report options
276276
# stored under config = { "report_content": [1, 2, 3, 4], "reports": [1,2,3,4],[1,2]}
277-
name_dict = report_arg_parsing.parse_global_report_options(args.report_content,args.report_preset, args.input_display_column, args.anonymise, args.input_date_column, args.background_date_column,args.date_format, args.background_location_column, config)
277+
name_dict = report_arg_parsing.parse_global_report_options(args.report_title,args.report_content,args.report_preset, args.global_snipit,args.input_display_column, args.anonymise, args.input_date_column, args.background_date_column,args.date_format, args.background_location_column, config)
278278
report_arg_parsing.parse_optional_report_content(args.query_table_content,args.mutations, args.timeline_dates, args.timeline_group_column, args.colour_theme, args.colour_map, config)
279279
report_arg_parsing.parse_map_options(args.background_map_date_range, args.background_map_column, args.background_map_file, args.centroid_file, args.background_map_location, args.query_map_file, args.longitude_column, args.latitude_column, found_in_background_data, args.background_map_colours, args.background_map_other_colours,config)
280280
report_arg_parsing.parse_tree_options(args.tree_annotations,args.max_tree_size, config)

civet/input_parsing/report_arg_parsing.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def qc_report_content(config):
8484

8585
#then at some point we need to update the treefile with these display names using jclusterfunk
8686

87-
def parse_global_report_options(report_content,report_preset,report_column, anonymise,date_column, background_date_column,date_format,location_column, config):
87+
def parse_global_report_options(report_title,report_content,report_preset,report_column, anonymise,date_column, background_date_column,date_format,location_column, config):
8888
"""
8989
parses the report group arguments
9090
--report-content (Default 1,2,3)
@@ -94,8 +94,9 @@ def parse_global_report_options(report_content,report_preset,report_column, anon
9494
--background-date-column (default: sample_date if present, False if not)
9595
--timeline-dates
9696
"""
97-
97+
9898
# if command line arg, overwrite config value
99+
misc.add_arg_to_config(KEY_REPORT_TITLE,report_title,config)
99100
misc.add_arg_to_config(KEY_REPORT_CONTENT,report_content,config)
100101
misc.add_arg_to_config(KEY_REPORT_PRESET,report_preset,config)
101102
if config[KEY_REPORT_PRESET]:

0 commit comments

Comments
 (0)