X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fservice.py;h=665863898a6d43f7a8ae0d5b1175d77bdaabb4da;hb=df4cb7d8ad3eb9602daefad6cdbe12227e2df03b;hp=6f44f49c9f13b141ccbe4ffbcb11fdbf65095654;hpb=30676926ef79a0e6b9bade2ad277c82a322f5f3d;p=qcg-portal.git

diff --git a/qcg/service.py b/qcg/service.py
index 6f44f49..6658638 100644
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -6,7 +6,7 @@ from django.utils.timezone import now
 from pyqcg import QCG
 from pyqcg.description import JobDescription
 from pyqcg.service import Registry
-from pyqcg.utils import Credential, TimePeriod
+from pyqcg.utils import Credential, TimePeriod, JobStatus, TaskStatus
 
 
 logger = logging.getLogger(__name__)
@@ -30,7 +30,8 @@ def update_user_data(user, proxy):
     # Jobs
     ###################################
     jts = time.time()
-    jobs = registry.jobs(**changed_filter)
+    jobs = registry.jobs(stats=[v for k, v in vars(JobStatus).iteritems() if not k.startswith('__')],
+                         **changed_filter)
     jte = time.time()
 
     jobs_count = 0
@@ -45,7 +46,8 @@ def update_user_data(user, proxy):
     # Tasks
     ###################################
     tts = time.time()
-    tasks = registry.tasks(**changed_filter)
+    tasks = registry.tasks(stats=[v for k, v in vars(TaskStatus).iteritems() if not k.startswith('__')],
+                           **changed_filter)
     tte = time.time()
 
     jobs_cache = {j.job_id: j for j in Job.objects.filter(owner=user)}
@@ -86,8 +88,8 @@ def submit_job(params, proxy):
     desc = JobDescription(Credential(proxy))
 
     direct_map = ('env_variables', 'executable', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs',
-                  'wall_time', 'memory', 'memory_per_slot', 'modules', 'native', 'notify', 'preprocess', 'postprocess',
-                  'persistent')
+                  'wall_time', 'memory', 'memory_per_slot', 'modules', 'input', 'stage_in', 'native', 'notify',
+                  'preprocess', 'postprocess', 'persistent')
 
     for name in direct_map:
         if params[name]:
@@ -102,9 +104,6 @@ def submit_job(params, proxy):
     if params['watch_output']:
         desc.set_watch_output(params['watch_output'], params['watch_output_pattern'])
     # TODO script
-    # TODO executable
-    # TODO input
-    # TODO stage_in
     # TODO stage_out
     # TODO monitoring