From 50e476ca3ca43cbf91dccd34ff0488e9f65b95d5 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Wed, 11 May 2022 11:02:05 +0200 Subject: [PATCH] Neue Tabelle qa_dbtest2project, Bearbeitungsformulare #4 --- src-modules/module/qa/conf/qa.xml | 32 +++++++++++++++---- .../module/qa/masken/37100_felderinfo.unl | 6 ++-- .../module/qa/masken/37100_maskeninfo.unl | 12 +++---- .../module/qa/masken/37120_felderinfo.unl | 10 +++--- .../qa/masken/37120_masken_felder_bez.unl | 2 ++ .../module/qa/masken/37120_maskeninfo.unl | 14 ++++---- .../module/qa/masken/37140_felderinfo.unl | 8 +++-- .../qa/masken/37140_masken_felder_bez.unl | 1 + .../module/qa/masken/37140_maskeninfo.unl | 15 ++++++++- 9 files changed, 71 insertions(+), 29 deletions(-) diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml index e916eb6..b63ef1a 100644 --- a/src-modules/module/qa/conf/qa.xml +++ b/src-modules/module/qa/conf/qa.xml @@ -493,7 +493,7 @@ notnull="false"> - + formuliert als SQL-where-Ausdruck @@ -521,7 +521,7 @@ notnull="false"> - + @@ -771,17 +771,28 @@ delete="FALSE" displayType="select" visibleFields="name" format="%s"> - - + + + + + + + + + - - - + + + + + diff --git a/src-modules/module/qa/masken/37100_felderinfo.unl b/src-modules/module/qa/masken/37100_felderinfo.unl index 45f6981..b2e87a0 100644 --- a/src-modules/module/qa/masken/37100_felderinfo.unl +++ b/src-modules/module/qa/masken/37100_felderinfo.unl @@ -5,5 +5,7 @@ 37104^Komponente^10^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^^^ 37105^Nur aktive^30^0^0^150^80^1^integer^200^0^1^<> select 1,'Ja' from xdummy union select 0,'nein' from xdummy order by 1 desc;^^<>select 1,'Ja' from xdummy^ 37106^Ab Datum^40^0^0^150^80^1^date^200^0^0^ ^^<> select today()-3 from xdummy^ -37107^DB-Test^100^0^0^150^200^1^integer^200^0^1^<> select tid,name from qa_dbtest where 1=1 \ -/* and project_id=<> */ order by 2^ ^ ^ +37107^DB-Test^100^0^0^150^200^1^integer^200^0^1^<> select T.tid,T.name from qa_dbtest T where active=1 \ +/* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<>) */ \ +/* and T.systeminfo_id=<> */\ +order by 2^ ^ ^ diff --git a/src-modules/module/qa/masken/37100_maskeninfo.unl b/src-modules/module/qa/masken/37100_maskeninfo.unl index 97bef67..9c65a7e 100644 --- a/src-modules/module/qa/masken/37100_maskeninfo.unl +++ b/src-modules/module/qa/masken/37100_maskeninfo.unl @@ -22,23 +22,21 @@ R.result_code,\ null::integer as result_status,\ ''::char(255) as result_status_str,\ R.result_value,\ -P.systeminfo_id,\ +T.systeminfo_id,\ ''::char(255) as systeminfo_id_str,\ A.tid as qa_dbtest_assertion_id,\ A.def_col_caption,\ A.def_col_name,\ A.def_col_value\ "\ -source="qa_project P,qa_dbtest T, qa_dbtest_assertion A left outer join qa_dbtest_result R on (R.dbtest_assertion_id=A.tid /* and date(R.execution_start) >= date_val(<>) */)"\ +source="qa_dbtest T, qa_dbtest_assertion A left outer join qa_dbtest_result R on (R.dbtest_assertion_id=A.tid /* and date(R.execution_start) >= date_val(<>) */)"\ target="tmp_qa_dbtest">\ --- nested in selectinto muss die where Bedingung u. ggfs. group by etc kommen\ where \ - P.tid=T.project_id\ - and T.tid=A.dbtest_id\ + T.tid=A.dbtest_id\ /* and T.active=<> */\ - /* and P.tid=<> */\ + /* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<>) */\ /* and E.userinfo_id=<> */\ - /* and P.systeminfo_id=<> */\ + /* and T.systeminfo_id=<> */\ /* and T.name ilike '%<>%' */\ /* and T.tid=<> */\ \ diff --git a/src-modules/module/qa/masken/37120_felderinfo.unl b/src-modules/module/qa/masken/37120_felderinfo.unl index b3308b0..7b082f1 100644 --- a/src-modules/module/qa/masken/37120_felderinfo.unl +++ b/src-modules/module/qa/masken/37120_felderinfo.unl @@ -1,6 +1,8 @@ 37120^Benutzer/in^50^0^0^150^200^1^integer^200^0^1^<> select tid,nvl(name,benutzer) from userinfo order by 2;^hidden^^ -37121^Ausgabetabelle^0^0^0^150^80^1^integer^200^0^1^<> select tid,name from qa_resultset order by 2;^^^ -37122^Ausgabetabellen^100^0^0^150^300^1^char^30^0^18^^^<> select '../edit/qa/qa_resultset_list.jsp' from xdummy;^ +37121^Ausgabetabelle^10^0^0^150^80^1^integer^200^0^1^<> select tid,name from qa_resultset where 1=1 /* and systeminfo_id=<> */ order by 2;^^^ +37122^Ausgabetabellen verwalten^100^0^0^150^300^1^char^30^0^18^^^<> select '../edit/qa/qa_resultset_list.jsp' from xdummy;^ 37123^Name^20^0^0^150^150^1^sql^50^0^0^^^^ -37124^Komponente^30^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^hidden^^ -37125^Projekte^200^0^0^150^300^1^char^30^0^18^^^<> select '../edit/qa/qa_project_list.jsp' from xdummy;^ +37124^Komponente^1^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^ ^^ +37125^Projekte verwalten^200^0^0^150^300^1^char^30^0^18^^^<> select '../edit/qa/qa_project_list.jsp' from xdummy;^ +37126^Projekt^5^0^0^150^200^1^integer^200^0^1^<> select tid,name from qa_project where active=1 /* and systeminfo_id=<> */ order by 2;^^^ +37127^Status Test^200^0^0^150^200^1^integer^200^0^1^<> select 1,'nur aktive' from xdummy union select 0,'nur inaktive' from xdummy order by 2;^^<> select 1,'nur aktive' from xdummy^ diff --git a/src-modules/module/qa/masken/37120_masken_felder_bez.unl b/src-modules/module/qa/masken/37120_masken_felder_bez.unl index 8f9f7c8..e561658 100644 --- a/src-modules/module/qa/masken/37120_masken_felder_bez.unl +++ b/src-modules/module/qa/masken/37120_masken_felder_bez.unl @@ -4,3 +4,5 @@ 37120^37123^ 37120^37124^ 37120^37125^ +37120^37126^ +37120^37127^ diff --git a/src-modules/module/qa/masken/37120_maskeninfo.unl b/src-modules/module/qa/masken/37120_maskeninfo.unl index eab5abe..2c2f187 100644 --- a/src-modules/module/qa/masken/37120_maskeninfo.unl +++ b/src-modules/module/qa/masken/37120_maskeninfo.unl @@ -6,7 +6,7 @@ ord smallint,\ tid INTEGER , \ uniquename VARCHAR(255) , \ name VARCHAR(255) , \ -project_id INTEGER , \ +systeminfo_id INTEGER , \ resultset_id INTEGER ,\ resultset_str varchar(255) , \ resultset_field_id INTEGER , \ @@ -21,7 +21,7 @@ insert into tmp_qa_dbtest (ord,\ tid,\ uniquename,\ name,\ - project_id,\ + systeminfo_id,\ resultset_field_id,\ whereclause,\ active,\ @@ -31,7 +31,7 @@ select 1 as ord,\ tid,\ uniquename,\ name,\ - project_id,\ + systeminfo_id,\ resultset_field_id,\ whereclause,\ active,\ @@ -39,9 +39,11 @@ select 1 as ord,\ ('37140&DB-Test=' || D.tid)::varchar(255) as nexttable\ FROM qa_dbtest D\ where 1=1\ -/* and T.resultset_field_id=<> */\ -/* and T.name like '%<>%' */\ -/* and T.systeminfo_id=<> */\ +/* and D.resultset_field_id=<> */\ +/* and D.name like '%<>%' */\ +/* and D.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<> )*/\ +/* and D.systeminfo_id=<> */\ +/* and D.active=<> */\ ;\ \ update tmp_qa_dbtest set resultset_id=R.resultset_id,\ diff --git a/src-modules/module/qa/masken/37140_felderinfo.unl b/src-modules/module/qa/masken/37140_felderinfo.unl index 413b058..26e5de0 100644 --- a/src-modules/module/qa/masken/37140_felderinfo.unl +++ b/src-modules/module/qa/masken/37140_felderinfo.unl @@ -1,2 +1,6 @@ -37140^DB-Test^50^0^0^150^200^1^integer^200^1^1^<> select tid,name from qa_dbtest order by 2^ ^ ^ -37144^Komponente^1^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^hidden^ ^ +37140^DB-Test^50^0^0^150^200^1^integer^200^1^1^<> select T.tid,T.name from qa_dbtest T where T.active=1\ + /* and T.systeminfo_id=<> */\ + /* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<>) */\ +order by 2^ ^ ^ +37141^Projekt^20^0^0^150^80^1^integer^200^0^1^<> select tid,name from qa_project where active=1 /* and systeminfo_id=<> */ order by 2;^^^ +37144^Komponente^1^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^ ^ ^ diff --git a/src-modules/module/qa/masken/37140_masken_felder_bez.unl b/src-modules/module/qa/masken/37140_masken_felder_bez.unl index 16766c8..572de8c 100644 --- a/src-modules/module/qa/masken/37140_masken_felder_bez.unl +++ b/src-modules/module/qa/masken/37140_masken_felder_bez.unl @@ -1,2 +1,3 @@ 37140^37140^ +37140^37141^ 37140^37144^ diff --git a/src-modules/module/qa/masken/37140_maskeninfo.unl b/src-modules/module/qa/masken/37140_maskeninfo.unl index df9b3c6..3078fb3 100644 --- a/src-modules/module/qa/masken/37140_maskeninfo.unl +++ b/src-modules/module/qa/masken/37140_maskeninfo.unl @@ -36,6 +36,10 @@ where A.dbtest_id=<>\ \ \ \ +create temp table tmp_qa_dbtest_result_id\ +(qa_dbtest_result_id integer);\ +\ +\ <#foreach dbtest in qa_dbtests>\ \ \ @@ -49,6 +53,7 @@ where ${dbtest.whereclause}\ ;\ \ \ +\ <#foreach dbtest_assertion in qa_dbtest_assertions>\ <#if dbtest_assertion.dbtest_id==dbtest.tid>\ \ @@ -70,6 +75,13 @@ T.${dbtest_assertion.def_col_name} as result_value\ from tmp_anfang A left outer join tmp_rs T\ on (1=${dbtest_assertion.rownr})\ ;\ +insert into tmp_qa_dbtest_result_id(qa_dbtest_result_id)\ +<#if SQLdialect='Postgres'>\ +select currval('qa_dbtest_result_tid_seq') from xdummy\ +<#else>\ +select max(tid) from qa_dbtest_result\ +\ +;\ \ \ \ @@ -89,6 +101,7 @@ select R.dbtest_id,\ FROM qa_dbtest T, qa_dbtest_result R\ where T.tid=R.dbtest_id\ and T.tid=<>\ +and R.tid in (select qa_dbtest_result_id from tmp_qa_dbtest_result_id)\ order by 4 desc;^XIL List\ drop_and_delete movable_columns sizable_columns horizontal_scrolling\ white_space_color=COLOR_WHITE fixed_columns=2\ @@ -114,4 +127,4 @@ Column CID=1 heading_text="DB-Test Ergebnis \\n Wert" center_heading\ Column CID=1 heading_text="DB-Test \\nProtokoll" center_heading\ row_selectable col_selectable heading_platform readonly\ width=9 text_size=200\ -@@@^^^Einen Datenbank-Test ausführen^ ^^1^440^360^0^1^^ +@@@^^^Einen Datenbank-Test ausführen^drop table tmp_qa_dbtest_result_id;^^1^440^360^0^1^^