From 4917d00fa8db06985d3f0e3922e27ce333f86a76 Mon Sep 17 00:00:00 2001 From: Llewellyn Marshall Date: Thu, 25 May 2023 14:54:13 -0400 Subject: [PATCH] add string agg to dojo and fix syntax error in reporter --- Open-ILS/web/js/ui/default/staff/reporter/services/template.js | 2 +- Open-ILS/web/reports/xul/transforms.js | 5 +++++ build/i18n/po/reports.js/reports.js.pot | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/ui/default/staff/reporter/services/template.js b/Open-ILS/web/js/ui/default/staff/reporter/services/template.js index 4c6cfa3838..adc6dca354 100644 --- a/Open-ILS/web/js/ui/default/staff/reporter/services/template.js +++ b/Open-ILS/web/js/ui/default/staff/reporter/services/template.js @@ -164,7 +164,7 @@ function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) { }, string_agg : { - datatype : [ OILS_RPT_DTYPE_NOT_BOOL ], + datatype : OILS_RPT_DTYPE_NOT_BOOL, label : egCore.strings.TRANSFORMS_STRING_AGG, aggregate : true }, diff --git a/Open-ILS/web/reports/xul/transforms.js b/Open-ILS/web/reports/xul/transforms.js index 96b909d8ee..7bcbda9c31 100644 --- a/Open-ILS/web/reports/xul/transforms.js +++ b/Open-ILS/web/reports/xul/transforms.js @@ -74,6 +74,11 @@ var OILS_RPT_TRANSFORMS = { label : rpt_strings.TRANSFORMS_MAX }, + string_agg : { + datatype : OILS_RPT_DTYPE_NOT_BOOL, + label : rpt_strings.TRANSFORMS_STRING_AGG, + aggregate : true + }, /* string transforms ------------------------- */ substring : { diff --git a/build/i18n/po/reports.js/reports.js.pot b/build/i18n/po/reports.js/reports.js.pot index 77cee9219d..56253cab3f 100644 --- a/build/i18n/po/reports.js/reports.js.pot +++ b/build/i18n/po/reports.js/reports.js.pot @@ -216,6 +216,10 @@ msgstr "" msgid "Max" msgstr "" +#: reports.js:TFORMS_LABEL_STRING_AGG reports.js:TRANSFORMS_STRING_AGG +msgid "String Aggregate" +msgstr "" + #: reports.js:TFORMS_LABEL_LOWER reports.js:TRANSFORMS_LOWER msgid "Lower case" msgstr "" -- 2.11.0