From 18d12a8a401cc66cfad56393b00b8db171e483f6 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Thu, 4 Apr 2024 22:09:15 +1100 Subject: [PATCH 1/5] update tool-use-by-group query --- parts/22-query.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parts/22-query.sh b/parts/22-query.sh index ed81a9e6..2219b9ba 100644 --- a/parts/22-query.sh +++ b/parts/22-query.sh @@ -1140,7 +1140,7 @@ query_tool-last-used-date() { ## : When was the most recent invocation of every EOF } -query_tool-use-by-group() { ##? [--group=]: Lists count of tools used by all users in a group +query_tool-use-by-group() { ##? [--group=]: Lists count of tools used by all users in a group meta <<-EOF ADDED: 19 EOF From 5c6ed4f7a860a42ba88bfb0b18f068a437f7ffa1 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Fri, 5 Apr 2024 12:24:39 +1100 Subject: [PATCH 2/5] Update parts/22-query.sh Co-authored-by: Helena --- parts/22-query.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parts/22-query.sh b/parts/22-query.sh index 2219b9ba..5a3ba4f8 100644 --- a/parts/22-query.sh +++ b/parts/22-query.sh @@ -1143,6 +1143,8 @@ query_tool-last-used-date() { ## : When was the most recent invocation of every query_tool-use-by-group() { ##? [--group=]: Lists count of tools used by all users in a group meta <<-EOF ADDED: 19 + UPDATED: 22 + AUTHORS: gavindi EOF handle_help "$@" <<-EOFhelp Lists tools use count by users in group. From e3d2cae45af391f8583efa1d027b7e9f501d1559 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Fri, 5 Apr 2024 12:24:52 +1100 Subject: [PATCH 3/5] Update parts/22-query.sh Co-authored-by: Helena --- parts/22-query.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parts/22-query.sh b/parts/22-query.sh index 5a3ba4f8..2dc2213d 100644 --- a/parts/22-query.sh +++ b/parts/22-query.sh @@ -1140,7 +1140,7 @@ query_tool-last-used-date() { ## : When was the most recent invocation of every EOF } -query_tool-use-by-group() { ##? [--group=]: Lists count of tools used by all users in a group +query_tool-use-by-group() { ##? : Lists count of tools used by all users in a group meta <<-EOF ADDED: 19 UPDATED: 22 From c917adac2abb0b8103bf353e5fc61a13e28b5d97 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Fri, 5 Apr 2024 12:26:25 +1100 Subject: [PATCH 4/5] include arg_group in query --- parts/22-query.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parts/22-query.sh b/parts/22-query.sh index 2dc2213d..a9b88e50 100644 --- a/parts/22-query.sh +++ b/parts/22-query.sh @@ -1174,6 +1174,8 @@ EOFhelp user_group_association.user_id = galaxy_user.id AND date_trunc('month', job.create_time) = '$arg_year_month-01' + AND + galaxy_group.name = '$arg_group' GROUP BY job.tool_id, galaxy_user.username EOF From 4efdab1074962bfdd966b00f8e3808a7ef5b8a14 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Fri, 5 Apr 2024 12:30:39 +1100 Subject: [PATCH 5/5] whitespace --- parts/22-query.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/22-query.sh b/parts/22-query.sh index a9b88e50..b78f3b37 100644 --- a/parts/22-query.sh +++ b/parts/22-query.sh @@ -1174,8 +1174,8 @@ EOFhelp user_group_association.user_id = galaxy_user.id AND date_trunc('month', job.create_time) = '$arg_year_month-01' - AND - galaxy_group.name = '$arg_group' + AND + galaxy_group.name = '$arg_group' GROUP BY job.tool_id, galaxy_user.username EOF