Compare commits

..

2 Commits

  1. 7
      src-modules/module/qa/datentabellen/qa_mask_execution_assert_result_code_setzen.sql
  2. 6
      src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_int_fuellen.sql
  3. 13
      src-modules/module/qa/masken/37060_maskeninfo.unl
  4. 6
      superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x

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

@ -166,7 +166,8 @@ from qa_mask_execution2project TP, qa_project P @@ -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 @@ -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 @@ -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 @@ -269,7 +272,7 @@ from tmp_qa_dbtest
drop table tmp_qa_dbtest;
</#if> --Ende wenn keine Maske ausgewählt ist
<#if inEtl>

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

@ -49,7 +49,10 @@ S.stutyp, @@ -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')) @@ -61,3 +64,4 @@ and S.stichtag in (select I.tid from sos_stichtag I where appl_key in ('0','1'))
</#if>

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

@ -358,10 +358,8 @@ zeitraum,\ @@ -358,10 +358,8 @@ zeitraum,\
comparison,\
result_table_1,\
result_table_2,\
--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\
result_code_str,\
hidden_summe\
from tmp_abgleich\
where 1=1\
/* and <<Ausführungs-Status>>=result_code */\
@ -427,9 +425,6 @@ Column CID=1 heading_text="Wert ${profile.table_1_caption}" center_heading\ @@ -427,9 +425,6 @@ 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\
@ -477,4 +472,6 @@ Column CID=1 heading_text="Ergebnis" center_heading row_selectable col_selectabl @@ -477,4 +472,6 @@ 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^^

6
superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x

@ -22,8 +22,8 @@ cd $WEBAPP/WEB-INF @@ -22,8 +22,8 @@ cd $WEBAPP/WEB-INF
#echo CMD -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.bin.ExecuteMask -tid:$MASKEN_TID -out:$FILE_DIR/$FILE_NAME.pdf -user:admin "-params:${MASK_PARAM}&stylesheet=tabelle_fo_pdf.xsl&contenttype=application/pdf" -logger:$SUPERX_DIR/db/conf/logging.properties
# XLSX
java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.bin.ExecuteMask -tid:$MASKEN_TID -out:$FILE_DIR/$FILE_NAME.xlsx -user:admin "-params:${MASK_PARAM}&Zusammenfassung=0&stylesheet=tabelle_37020_mit_summary.jrxml&contenttype=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -logger:$SUPERX_DIR/db/conf/logging.properties
# PDF
java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.bin.ExecuteMask -tid:$MASKEN_TID -out:$FILE_DIR/$FILE_NAME.pdf -user:admin "-params:${MASK_PARAM}&stylesheet=tabelle_37020_mit_summary.jrxml&contenttype=application/pdf" -logger:$SUPERX_DIR/db/conf/logging.properties
#HTML
java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.bin.ExecuteMask -tid:$MASKEN_TID -out:$FILE_DIR/$FILE_NAME.htm -user:admin "-params:${MASK_PARAM}&Zusammenfassung=1&stylesheet=tabelle_37020_mit_summary.jrxml&contenttype=text/html" -logger:$SUPERX_DIR/db/conf/logging.properties
@ -44,6 +44,6 @@ export F_ANZ=$(grep -c Fehler $FILE_DIR/$FILE_NAME.csv) @@ -44,6 +44,6 @@ export F_ANZ=$(grep -c Fehler $FILE_DIR/$FILE_NAME.csv)
#Mail Versand
cat $FILE_DIR/$FILE_NAME.htm | $MAILPROG -s "Testfall-Protokoll | $W_ANZ Warnungen | $F_ANZ Fehler" -M "text/html" -a $FILE_DIR/$FILE_NAME.xlsx "${LOGMAIL}"
cat $FILE_DIR/$FILE_NAME.htm | $MAILPROG -s "Testfall-Protokoll | $W_ANZ Warnungen | $F_ANZ Fehler" -M "text/html" -a $FILE_DIR/$FILE_NAME.pdf "${LOGMAIL}"

Loading…
Cancel
Save