diff --git a/lib/galaxy/webapps/reports/controllers/jobs.py b/lib/galaxy/webapps/reports/controllers/jobs.py index 460fcbcb48bb..85131da45912 100644 --- a/lib/galaxy/webapps/reports/controllers/jobs.py +++ b/lib/galaxy/webapps/reports/controllers/jobs.py @@ -52,6 +52,7 @@ def sorter(default_sort_id, kwd): return SortSpec(sort_id, order, arrow, _order) + def get_spark_time( time_period ): _time_period = 0 @@ -69,6 +70,7 @@ def get_spark_time( time_period ): return time_period, _time_period + class SpecifiedDateListGrid( grids.Grid ): class JobIdColumn( grids.IntegerColumn ): diff --git a/lib/galaxy/webapps/reports/controllers/workflows.py b/lib/galaxy/webapps/reports/controllers/workflows.py index ef9c0abd7e24..41424e719342 100644 --- a/lib/galaxy/webapps/reports/controllers/workflows.py +++ b/lib/galaxy/webapps/reports/controllers/workflows.py @@ -160,7 +160,7 @@ def per_month_all( self, trans, **kwd ): from_obj=[ sa.outerjoin( model.StoredWorkflow.table, model.User.table ) ], group_by=self.group_by_month( model.StoredWorkflow.table.c.create_time ), order_by=[ _order ] ) - + all_workflows = sa.select( ( self.select_day( model.StoredWorkflow.table.c.create_time ).label( 'date' ), model.StoredWorkflow.table.c.id ) ) @@ -207,7 +207,7 @@ def per_user( self, trans, **kwd ): _order = specs.exc_order time_period = kwd.get('spark_time') time_period, _time_period = get_spark_time( time_period ) - limit=30 + limit = 30 workflows = [] q = sa.select( ( model.User.table.c.email.label( 'user_email' ), @@ -272,7 +272,7 @@ def user_per_month( self, trans, **kwd ): from_obj=[ model.StoredWorkflow.table ], group_by=self.group_by_month( model.StoredWorkflow.table.c.create_time ), order_by=[ _order ] ) - + all_workflows_user_month = sa.select( ( self.select_day( model.StoredWorkflow.table.c.create_time ).label( 'date' ), model.StoredWorkflow.table.c.id ), whereclause=model.StoredWorkflow.table.c.user_id == user_id,