paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Added simple library for progress

Browse source
This commit is contained in:
absurdo 2023-04-11 01:56:22 +02:00
parent 0e777c4d75
commit cce399a7a6
3 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/dashboard.py
View file

@ -24,6 +24,7 @@ import os
import configparser import configparser
from collections import OrderedDict from collections import OrderedDict
from importlib import import_module, reload from importlib import import_module, reload
from modules.pastafari2.libraries.progress import load_progress
try: try:
import ujson as json import ujson as json
@ -270,7 +271,7 @@ def pastafari2_add_server_task():
def pastafari2_progress(): def pastafari2_progress():
db=g.connection db=g.connection
"""
task_id=request.args.get('task_id', '0') task_id=request.args.get('task_id', '0')
position=request.args.get('position', '0') position=request.args.get('position', '0')
@ -279,13 +280,20 @@ def pastafari2_progress():
arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where() 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) #print(arr_task)
if 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: else:
return "" return ""
"""
return load_progress(db, t)
@admin_app.route('/pastafari2/getprogress/', methods=['POST']) @admin_app.route('/pastafari2/getprogress/', methods=['POST'])

24
libraries/progress.py Normal file
View file

@ -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 ""

1
templates/admin/progress.phtml
View file

@ -26,6 +26,7 @@
<h3>${hostname}</h3> <h3>${hostname}</h3>
<h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2> <h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2>
<p>${description_task}</p> <p>${description_task}</p>
${return_tree|n}
<hr /> <hr />
<i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i> <i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i>
<div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div> <div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div>