combine panels

This commit is contained in:
Paul Trowbridge 2025-08-11 20:47:08 -04:00
parent 3f56f04f8b
commit a649924c86
2 changed files with 66 additions and 75 deletions

View File

@ -499,6 +499,7 @@ BEGIN
SELECT SELECT
'Target Calculation' AS label, 'Target Calculation' AS label,
( (
SELECT * FROM (
SELECT SELECT
----------------------label------------------------------------------------ ----------------------label------------------------------------------------
CASE WHEN value <> '' THEN RTRIM(SUBSTRING(value,1,18)) ELSE 'No Target' END AS label, CASE WHEN value <> '' THEN RTRIM(SUBSTRING(value,1,18)) ELSE 'No Target' END AS label,
@ -518,16 +519,7 @@ BEGIN
FROM @queue q FROM @queue q
OUTER APPLY OPENJSON(q.expl, '$.target_math') OUTER APPLY OPENJSON(q.expl, '$.target_math')
WITH (value NVARCHAR(MAX) '$') WITH (value NVARCHAR(MAX) '$')
FOR JSON PATH
) AS details
UNION ALL UNION ALL
-- Target Price
SELECT
'Target Total' AS label,
(
SELECT SELECT
----------------------label------------------------------------------------ ----------------------label------------------------------------------------
'Price' AS label, 'Price' AS label,
@ -536,8 +528,9 @@ BEGIN
----------------------type------------------------------------------------- ----------------------type-------------------------------------------------
'currency' AS type, 'currency' AS type,
----------------------note------------------------------------------------- ----------------------note-------------------------------------------------
'' AS note 'Total' AS note
FROM @queue q FROM @queue q
) x
FOR JSON PATH FOR JSON PATH
) AS details ) AS details

View File

@ -485,6 +485,7 @@ BEGIN
jsonb_build_object( jsonb_build_object(
'label', 'Target Calculation', 'label', 'Target Calculation',
'details', 'details',
-- jsonb_build_array(
( (
SELECT SELECT
jsonb_agg( jsonb_agg(
@ -516,11 +517,8 @@ BEGIN
) )
FROM jsonb_array_elements_text(COALESCE(_tmath,'{}'::jsonb)) ae FROM jsonb_array_elements_text(COALESCE(_tmath,'{}'::jsonb)) ae
) )
), ||jsonb_build_object('label','Price','value',_tprice,'type','currency','note','Total')
jsonb_build_object( -- )
'label', 'Target Total',
'details',
jsonb_build_object('label','Price','value',_tprice,'type','currency','note','')
), ),
------------------------------------------ ------------------------------------------
-- history -- history