diff --git a/src-modules/module/qa/masken/37020_maskeninfo.unl b/src-modules/module/qa/masken/37020_maskeninfo.unl index b7677b9..be3524e 100644 --- a/src-modules/module/qa/masken/37020_maskeninfo.unl +++ b/src-modules/module/qa/masken/37020_maskeninfo.unl @@ -20,6 +20,7 @@ R.result_code,\ null::integer as result_status,\ ''::char(255) as result_status_str,\ A.result_value,\ +E.tid as execution_id,\ E.name as execution_name,\ E.uniquename,\ E.systeminfo_id,\ @@ -29,7 +30,9 @@ E.maskeninfo_id,\ A.mask_execution_assert_id,\ null::integer as result_value_min,\ null::integer as result_value_max,\ -null::varchar as assert_caption,\ +null::varchar(255) as assert_caption,\ +null::varchar(255)[] as fields, \ +('' || E.maskeninfo_id || '&')::text as nextmask,\ ('../edit/qa/qa_mask_execution_edit.jsp|tid=' || E.tid)::varchar(255) as nextedit\ "\ source="qa_mask_execution E, qa_mask_execution_result R left outer join qa_mask_execution_assert_result A on (A.mask_execution_result_id=R.tid)"\ @@ -97,11 +100,25 @@ where S.tid=tmp_qa_mask_execution.systeminfo_id);\ update tmp_qa_mask_execution set maskeninfo_id_str=(select name from maskeninfo M\ where M.tid=tmp_qa_mask_execution.maskeninfo_id);\ \ +<#if SQLdialect='Postgres'>\ +\ +update tmp_qa_mask_execution set fields=(select array_agg(trim(F.name) || '=' || trim(S.field_value))\ +from qa_mask_field_sel S, felderinfo F\ +where S.felderinfo_id=F.tid\ +and S.is_active=1\ +and S.mask_execution_id=tmp_qa_mask_execution.execution_id\ +);\ +\ +update tmp_qa_mask_execution set nextmask=nextmask || array_to_string(fields,'&','')\ +where fields is not null;\ +\ +\ \ select systeminfo_id_str,\ execution_name,\ uniquename,\ maskeninfo_id_str,\ +nextmask,\ execution_start,\ <#if SQLdialect='Postgres'>\ round(extract(second from (execution_end-execution_start))::decimal,0)::integer as dauer,\ @@ -135,6 +152,9 @@ Column CID=1 heading_text="Testfall\\nSchlüssel" center_heading\ Column CID=1 heading_text="Maske" center_heading\ row_selectable col_selectable heading_platform readonly\ width=40 text_size=200\ +Column CID=1 heading_text="Maske\\naufrufen" center_heading\ + row_selectable col_selectable heading_platform readonly\ + width=40 text_size=200\ Column CID=1 heading_text="Ausführungszeit\\nStart" center_heading\ row_selectable col_selectable heading_platform readonly\ width=14 text_size=200\