Mercurial > roundup-cc > roundup-cc
diff display_issues.py @ 31:9aca070c86bd
Add the filter 'priority' for the search by status.
| author | Magnus Schieder <mschieder@intevation.de> |
|---|---|
| date | Thu, 22 Nov 2018 19:34:53 +0100 |
| parents | 8d86ba8dee42 |
| children | 80bbd06fe8ec |
line wrap: on
line diff
--- a/display_issues.py Thu Nov 22 14:07:55 2018 +0100 +++ b/display_issues.py Thu Nov 22 19:34:53 2018 +0100 @@ -40,7 +40,7 @@ return ", ".join(formated) -def get_webpage(data_dict, columns, status, keywords, graph=None): +def get_webpage(data_dict, columns, search_parameters, keywords, graph=None): if graph is None: graph = os.path.dirname(os.path.realpath(__file__)) + '/graph.html' @@ -58,14 +58,14 @@ js_data_dickt += "}" base_html_data = (base_html_data - .replace("status", status) + .replace("search_parameters", search_parameters) .replace("keywords", keywords) .replace("js_data_dickt", js_data_dickt) .replace("var timestamp=[];", "var timestamp=[" + make_js_object_date(data_dict["date"]) + "]")) return base_html_data -def compile_db_stats_html(db_file, sql_select, columns, status="", keywords="", graph=None): +def compile_db_stats_html(db_file, sql_select, columns, search_parameters="", keywords="", graph=None): data_dict = {"date": []} status_list = columns.split(", ") @@ -91,14 +91,14 @@ if con: con.close() - return get_webpage(data_dict, columns, status, keywords, graph) + return get_webpage(data_dict, columns, search_parameters, keywords, graph) def render_webpage(content): for line in content.split("\n"): print(line) -def render_db_stats_as_html(db_file, sql_select, columns, status="", keywords=""): - render_webpage(compile_db_stats_html(db_file, sql_select, columns, status, keywords)) +def render_db_stats_as_html(db_file, sql_select, columns, search_parameters="", keywords=""): + render_webpage(compile_db_stats_html(db_file, sql_select, columns, search_parameters, keywords)) if __name__ == '__main__': cgitb.enable()