diff --git a/admin/dashboard.py b/admin/dashboard.py index a4a7371..596ee7d 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -24,6 +24,7 @@ import os import configparser from collections import OrderedDict from importlib import import_module, reload +from modules.pastafari2.libraries.progress import load_progress try: import ujson as json @@ -270,7 +271,7 @@ def pastafari2_add_server_task(): def pastafari2_progress(): db=g.connection - + """ task_id=request.args.get('task_id', '0') position=request.args.get('position', '0') @@ -279,14 +280,21 @@ def pastafari2_progress(): arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where() + url_return=arr_task['url_return'] + + #print(url_return) + #print(arr_task) if arr_task: - return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=arr_task['url_return']) + return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=url_return) else: return "" - + """ + + return load_progress(db, t) + @admin_app.route('/pastafari2/getprogress/', methods=['POST']) def pastafari2_getprogress(): diff --git a/libraries/progress.py b/libraries/progress.py new file mode 100644 index 0000000..6a6603c --- /dev/null +++ b/libraries/progress.py @@ -0,0 +1,24 @@ +from modules.pastafari2.models.tasks import Task, LogTask +from flask import request +from paramecio2.libraries.i18n import I18n + +def load_progress(db, t, return_tree='', path_module='admin_app.pastafari2_dashboard'): + + task_id=request.args.get('task_id', '0') + + position=request.args.get('position', '0') + + task=Task(db) + + arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where() + + url_return=arr_task['url_return'] + + #print(url_return) + + #print(arr_task) + if arr_task: + return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module=path_module, name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=url_return, return_tree=return_tree) + else: + + return "" diff --git a/templates/admin/progress.phtml b/templates/admin/progress.phtml index a858545..dab8316 100644 --- a/templates/admin/progress.phtml +++ b/templates/admin/progress.phtml @@ -26,6 +26,7 @@
${description_task}
+${return_tree|n}