Commit 182d4bb2 authored by Marc Duez's avatar Marc Duez
Browse files

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into cdr3

parents 9ae79296 259fb38c
......@@ -20,11 +20,20 @@ def index():
disk_use, err = p.communicate()
return dict(worker = len(db().select(db.scheduler_worker.ALL)),
in_queue = len(db(db.scheduler_task.status=='QUEUED').select()),
queued = len(db(db.scheduler_task.status=='QUEUED').select()),
assigned = len(db(db.scheduler_task.status=='ASSIGNED').select()),
running = len(db(db.scheduler_task.status=='RUNNING').select()),
uptime=uptime,
disk_use=disk_use
)
def monitor():
# External monitor
return dict (worker = len(db().select(db.scheduler_worker.ALL)),
queued = len(db(db.scheduler_task.status=='QUEUED').select()),
assigned = len(db(db.scheduler_task.status=='ASSIGNED').select()),
running = len(db(db.scheduler_task.status=='RUNNING').select()))
def worker():
if auth.has_membership("admin"):
......
......@@ -72,9 +72,9 @@ def filter(str, filter_str):
for f in filter_list :
if len(f) > 0 and f[0] == "-" :
if str.lower().find(f[1:].lower()) != -1 :
if f[1:].lower() in str.lower():
return False
else :
if str.lower().find(f.lower()) == -1 :
if f.lower() not in str.lower():
return False
return True
......@@ -27,11 +27,12 @@
</br>
<div>
Worker status
Workers and tasks
<div class="console-div">
<div class="console-flex">active worker : {{=worker}}</div>
<div class="console-flex">run in process : {{=running}}</div>
<div class="console-flex">run in queue : {{=in_queue}}</div>
<div class="console-flex">active workers: {{=worker}}</div>
<div class="console-flex">QUEUED: {{=queued}}</div>
<div class="console-flex">ASSIGNED: {{=assigned}}</div>
<div class="console-flex">RUNNING: {{=running}}</div>
</div>
</div>
......
......@@ -8,7 +8,6 @@
search
<input id="db_filter_input" type="text" value="{{=request.vars["filter"]}}"
onchange="db.call('admin/log', {'file' : '{{=request.vars["file"]}}', 'filter' : this.value} )" >
<span>(multiple word accepted)</span>
</div>
</div>
......
workers
ALL={{=worker}}
tasks
QUEUED={{=queued}}
ASSIGNED={{=assigned}}
RUNNING={{=running}}
......@@ -13,7 +13,7 @@
<input id="upload_file" type="file" name="file" >
</td>
<td >
</td>
(.fa, .fastq, .fa.gz, .fastq.gz, .clntab) </td>
</tr>
</table>
</div>
......
......@@ -17,7 +17,6 @@
onchange="db.call('patient/custom', {'config_id' : '{{=request.vars["config_id"]}}',
'filter' : this.value,
'custom_list' : db.getListInput('custom_result[]')} )" >
<span>(multiple word accepted)</span>
</div>
......
......@@ -8,7 +8,8 @@
<div id="db_table_container">
<table class="db_table" id="table">
<thead>
<tr><td class="column_200"> group / user</td>
<tr><td class="column1"></td>
<td class="column_200"> group / user</td>
<td> </td>
<td class="column1"> read</td>
<td class="column1"> admin</td>
......@@ -18,7 +19,7 @@
{{admin = auth.has_permission("admin", "patient", request.vars["id"], auth.user.id)}}
{{ for row in query :}}
<tr>
<td> {{=row.owner}} </td>
<td> {{=row.id}} </td><td> {{=row.owner}} </td>
<td></td>
{{if admin :}}
<td> <input type="checkbox" onclick="db.call('patient/change_permission', {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment