Mehr als 2 Nachkommastellen bei Testfall-Sollwerten ermöglicht #4

Reviewed-on: #8

rsync_to_superx.x

@@ -1,7 +1,7 @@
 #!/bin/bash
 #Synchronisierung webapp zum Zielpfad
 
-ant  -DMODULE_PATH=$MEINMODUL_PFAD -DBASE_DIR=. -DMODULE=meinmodul all
+ant  -DMODULE_PATH=$QA_PFAD -DBASE_DIR=. -DMODULE=qa all
 
 
 

src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql

@@ -95,6 +95,13 @@ select
 ${dbtest_assertion.tid},
 A.beginn,
 now(),
+<#if dbtest_assertion.def_col_value="">
+--Test wenn Zielspalte leer sein soll:
+case when T.${dbtest_assertion.def_col_name} is null or '' || T.${dbtest_assertion.def_col_name}=''
+then 0
+else 1 end
+<#else>
+
 case when T.${dbtest_assertion.def_col_name}=
 <#if dbtest_assertion.def_col_function !="">
 ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}')
@@ -102,7 +109,10 @@ ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}')
 '${dbtest_assertion.def_col_value}' 
 </#if>
 then 0
-else 1 end as result_code,
+else 1 end 
+</#if>
+
+as result_code,
 T.${dbtest_assertion.def_col_name} as result_value
 from tmp_anfang A left outer join tmp_rs T
 on (A.dbtest_id=${dbtest_assertion.dbtest_id}

src-modules/module/qa/datentabellen/qa_mask_execution_assert_result_code_setzen.sql

@@ -6,7 +6,7 @@
 --Achtung: Diese Script qa_mask_execution_assert_result_code_setzen.sql ist auch das select_stmt der Maske 37020
 
 <#assign resultValueNative="result_value::float" />
-<#if SQLdialect='Postgres'>
+<#if SQLdialect='Postgres_alt'>
 <#assign resultValueNative="round(decval(replace(result_value,'.',',')),0) " />
 </#if>
 
@@ -166,7 +166,8 @@ from qa_mask_execution2project TP, qa_project P
 where TP.mask_execution_id=tmp_testcase.mask_execution_id
 and P.tid=TP.project_id
 ;
---nun DB-Tests:
+--nun DB-Tests, wenn keine Maske ausgewählt ist:
+<#if "<<Maske>>" =="">
 <@selectintotmp 
 select="
 T.tid,
@@ -232,6 +233,7 @@ update tmp_qa_dbtest set
 
 insert into tmp_testcase(testcase_type,
 systeminfo_id,
+projekt_str,
 execution_name,
 uniquename,
 --maskeninfo_id_str,
@@ -249,6 +251,7 @@ nextedit
 )
 select 2::integer as testcase_type, --DB-Test
 systeminfo_id,
+projekt_str,
 name,
 uniquename,
 case when ticket_link !='' then 'Ticket|' || ticket_link else '' end as ticket_link,
@@ -269,7 +272,7 @@ from tmp_qa_dbtest
 
 drop table tmp_qa_dbtest;
 
-
+</#if> --Ende wenn keine Maske ausgewählt ist
 
 <#if inEtl>
 

src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_astat_fuellen.sql

@@ -5,9 +5,9 @@
 select sp_table_exists('sos_stg_aggr') from xdummy
 </sqlvar> 
 <sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[
-select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
+select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1)
 union
-select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
+select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1)
 
 ]]></sqlvar> 
 </sqlvars>
@@ -270,8 +270,6 @@ group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
 
 </#foreach>
 
-update tmp_stg_aggr_astat set stg='0' || stg
-where length(trim(stg))=3;
 
 delete from qa_sos_stg_aggr_astat
 where sem_rueck_beur_ein in (select distinct K.sem_rueck_beur_ein
@@ -346,9 +344,7 @@ insert into qa_sos_stg_aggr_astat(hs_nr,
        from tmp_stg_aggr_astat
        group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30
        ;
-update qa_sos_stg_aggr_astat set stg='0'||stg where length(stg)=3
-and substring(stg from 1 for 1)  in ('0','1','2','3','4','5','6','7','8','9')
-;  
+ 
 
 drop table tmp_stg_aggr_astat;
        

src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_int_fuellen.sql

@@ -5,9 +5,9 @@
 select sp_table_exists('sos_stg_aggr') from xdummy
 </sqlvar> 
 <sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[
-select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
+select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1)
 union
-select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
+select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1)
 
 ]]></sqlvar> 
 </sqlvars>
@@ -49,7 +49,10 @@ S.stutyp,
 S.stufrm,
 S.summe,
 S.matrikel_nr,
-D.stg_astat as stg,
+--führende 0 entfernen:
+(case when substring(D.stg_astat from 1 for 1)='0' 
+	then substring(D.stg_astat from 2 for 3) 
+	else D.stg_astat end) as stg,
 D.abschluss_astat as abschluss,
 S.stichtag
 FROM dim_studiengang D, sos_stg_aggr S left outer join sos_k_hrst H
@@ -61,3 +64,4 @@ and S.stichtag in (select I.tid from sos_stichtag I where appl_key in ('0','1'))
 
 </#if>
 
+

src-modules/module/qa/masken/37020_maskeninfo.unl

@@ -166,7 +166,8 @@ from qa_mask_execution2project TP, qa_project P\
 where TP.mask_execution_id=tmp_testcase.mask_execution_id\
 and P.tid=TP.project_id\
 ;\
---nun DB-Tests:\
+--nun DB-Tests, wenn keine Maske ausgewählt ist:\
+<#if "<<Maske>>" =="">\
 <@selectintotmp \
 select="\
 T.tid,\
@@ -271,7 +272,7 @@ from tmp_qa_dbtest\
 \
 drop table tmp_qa_dbtest;\
 \
-\
+</#if> --Ende wenn keine Maske ausgewählt ist\
 \
 <#if inEtl>\
 \

src-modules/module/qa/masken/37060_maskeninfo.unl

@@ -358,8 +358,10 @@ zeitraum,\
 comparison,\
 result_table_1,\
 result_table_2,\
-result_code_str,\
-hidden_summe\
+--50 as _graphbar,\
+(100-( result_table_1::decimal(8,2))/(result_table_2::decimal(8,2))*100)::integer as _graphbar,\
+result_code_str\
+--hidden_summe\
  from tmp_abgleich\
  where 1=1\
 /* and <<Ausführungs-Status>>=result_code */\
@@ -425,6 +427,9 @@ Column CID=1 heading_text="Wert ${profile.table_1_caption}" center_heading\
 Column CID=1 heading_text="Wert ${profile.table_2_caption}" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=10 text_size=200\
+Column CID=1 heading_text="Differenz graphisch" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=10 \
 Column CID=1 heading_text="Status" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=10 text_size=200\
@@ -472,6 +477,4 @@ Column CID=1 heading_text="Ergebnis" center_heading row_selectable col_selectabl
 Column CID=1 heading_text="hidden_Summe" center_heading  row_selectable col_selectableh eading_platform readonly width=10 text_size=20\
 Column CID=1 heading_text="Summe" center_heading  row_selectable col_selectableh eading_platform readonly width=1 text_size=1\
 </#if>\
-@@@^ ^ ^Generische Auswertung eines Tabellenabgleichs mit Link zu Details bei Auswertung mit Aggregation des Vergleichs=Felder^drop table tmp_abgleich; \
-drop table tmp_abgleich_ds;               \
-drop table tmp_abgleich_summen;^^1^440^360^^1^^
+@@@^ ^ ^Generische Auswertung eines Tabellenabgleichs mit Link zu Details bei Auswertung mit Aggregation des Vergleichs=Felder^drop table tmp_abgleich; drop table tmp_abgleich_ds;               drop table tmp_abgleich_summen;^^1^440^360^^1^ ^

superx/edit/qa/qa_mask_execution_assert_edit.inc

@@ -38,13 +38,13 @@ else
 <span style="display:none" connectId="fld_field_value" dojoType="tooltip">Erwartes Ergebnis (min)</span></td>
 <td align="left">
 <div id="fld_field_value">
-<db:textField nullFieldValue="" styleClass="clsInputStyle" pattern="#" size="10" fieldName="result_value_min"/>
+<db:textField nullFieldValue="" styleClass="clsInputStyle"  size="10" fieldName="result_value_min"/>
 </div>
 <span style="display:none" connectId="fld_field_value" dojoType="tooltip">Erwartes Ergebnis (min)</span></td>
 
 <td align="left">
 <div id="fld_field_value">
-<db:textField nullFieldValue="" styleClass="clsInputStyle" pattern="#" size="10" fieldName="result_value_max"/>
+<db:textField nullFieldValue="" styleClass="clsInputStyle"  size="10" fieldName="result_value_max"/>
 </div>
 <span style="display:none" connectId="fld_field_value" dojoType="tooltip">Erwartes Ergebnis (max)</span></td>