diff --git a/src-modules/module/qa/conf/includes.txt b/src-modules/module/qa/conf/includes.txt index 2bba247..e340e7b 100644 --- a/src-modules/module/qa/conf/includes.txt +++ b/src-modules/module/qa/conf/includes.txt @@ -3,5 +3,7 @@ WEB-INF/conf/edustore/db/bin/SQL_ENV_qa.sam WEB-INF/conf/edustore/db/bin/qa_mask_execution.x WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x WEB-INF/lib/superx-qa.jar +WEB-INF/lib_ext/superx5.0_fuer_h1.jar +WEB-INF/reports/qa_table.jrtx WEB-INF/reports/tabelle_37020_mit_summary.jrxml xml/tabelle_html_qa.xsl diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml index 69a80d1..ee97b79 100644 --- a/src-modules/module/qa/conf/qa.xml +++ b/src-modules/module/qa/conf/qa.xml @@ -95,7 +95,7 @@ notnull="false" currentlyUsed="false"> +notnull="true" > @@ -110,6 +110,10 @@ notnull="false" > pk_qa_mask_execution1 + + + + diff --git a/src-modules/module/qa/masken/37020_felderinfo.unl b/src-modules/module/qa/masken/37020_felderinfo.unl index 13ead80..e461a53 100644 --- a/src-modules/module/qa/masken/37020_felderinfo.unl +++ b/src-modules/module/qa/masken/37020_felderinfo.unl @@ -8,3 +8,4 @@ 37027^Testfall-Schlüssel^55^0^0^150^150^1^char^50^0^0^^^^ 37028^Projekt^15^0^0^150^80^1^integer^200^0^1^<> select tid,name from qa_project where active=1 /* and systeminfo_id=<> */ order by 2;^^^ 37029^Testfall-Typ^1000^300^-1^170^150^1^integer^30^0^1^<> select 1,'Maskenausführung' from xdummy union select 2,'Datenbank-Test' from xdummy^^ ^ +37030^Zusammenfassung^1200^300^-1^170^150^1^integer^30^0^1^<> select 0,'Alles' from xdummy union select 1,'Nur Zusammenfassung' from xdummy^hidden^<> select 0,'Alles' from xdummy^ diff --git a/src-modules/module/qa/masken/37020_masken_felder_bez.unl b/src-modules/module/qa/masken/37020_masken_felder_bez.unl index 6fbe052..e1ffa5a 100644 --- a/src-modules/module/qa/masken/37020_masken_felder_bez.unl +++ b/src-modules/module/qa/masken/37020_masken_felder_bez.unl @@ -8,3 +8,4 @@ 37020^37027^ 37020^37028^ 37020^37029^ +37020^37030^ diff --git a/src-modules/module/qa/qa_mask_execution_loop.x b/src-modules/module/qa/qa_mask_execution_loop.x index 5864e2a..a0fc1b0 100755 --- a/src-modules/module/qa/qa_mask_execution_loop.x +++ b/src-modules/module/qa/qa_mask_execution_loop.x @@ -8,7 +8,7 @@ function exitAfterError trap exitAfterError ERR -TC_ALL=`psql --dbname=$DBNAME --tuples-only -c "select uniquename from qa_mask_execution where is_active=1 order by 1"` +TC_ALL=`psql --dbname=$DBNAME --tuples-only -c "select uniquename from qa_mask_execution where string_not_null(uniquename)!='' and is_active=1 order by 1"` cd $WEBAPP/WEB-INF diff --git a/src-modules/module/qa/upgrade/qa_pre_upgrade_ids.sql b/src-modules/module/qa/upgrade/qa_pre_upgrade_ids.sql new file mode 100644 index 0000000..af262d5 --- /dev/null +++ b/src-modules/module/qa/upgrade/qa_pre_upgrade_ids.sql @@ -0,0 +1,4 @@ +--mit Version 0.6 ist uniquename unique: + +update qa_mask_execution set uniquename=tid where uniquename is null or trim(uniquename)=''; + diff --git a/src-modules/module/qa/upgrade/qa_pre_upgrade_pg.sql b/src-modules/module/qa/upgrade/qa_pre_upgrade_pg.sql new file mode 100644 index 0000000..af262d5 --- /dev/null +++ b/src-modules/module/qa/upgrade/qa_pre_upgrade_pg.sql @@ -0,0 +1,4 @@ +--mit Version 0.6 ist uniquename unique: + +update qa_mask_execution set uniquename=tid where uniquename is null or trim(uniquename)=''; + diff --git a/superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x b/superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x index 6bdb0ac..2e6f350 100755 --- a/superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x +++ b/superx/WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x @@ -20,10 +20,13 @@ export MASK_PARAM="Ausführungs-Status=1,2&Ab Datum=${DATUM_EXEC}" # ExecuteMask funktioniert nur im WEB-INF Ordner 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 +#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 # 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_fo_pdf.xsl&contenttype=application/pdf" -logger:$SUPERX_DIR/db/conf/logging.properties +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 + # XML #java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.bin.ExecuteMask -tid:$MASKEN_TID -out:$FILE_DIR/$FILE_NAME.xml -user:admin "-params:${MASK_PARAM}&stylesheet=tabelle_fo_pdf.xsl&contenttype=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -logger:$SUPERX_DIR/db/conf/logging.properties @@ -41,6 +44,6 @@ export F_ANZ=$(grep -c Fehler $FILE_DIR/$FILE_NAME.csv) #Mail Versand -cat $FILE_DIR/$FILE_NAME.csv | $MAILPROG -s "Testfall-Protokoll | $W_ANZ Warnungen | $F_ANZ Fehler" -a $FILE_DIR/$FILE_NAME.pdf "${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}" diff --git a/superx/WEB-INF/lib_ext/superx5.0_fuer_h1.jar b/superx/WEB-INF/lib_ext/superx5.0_fuer_h1.jar new file mode 100644 index 0000000..3765ab8 Binary files /dev/null and b/superx/WEB-INF/lib_ext/superx5.0_fuer_h1.jar differ diff --git a/superx/WEB-INF/reports/qa_table.jrtx b/superx/WEB-INF/reports/qa_table.jrtx new file mode 100644 index 0000000..e7f63a5 --- /dev/null +++ b/superx/WEB-INF/reports/qa_table.jrtx @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/superx/WEB-INF/reports/tabelle_37020_mit_summary.jrxml b/superx/WEB-INF/reports/tabelle_37020_mit_summary.jrxml index c920749..f9cee5d 100644 --- a/superx/WEB-INF/reports/tabelle_37020_mit_summary.jrxml +++ b/superx/WEB-INF/reports/tabelle_37020_mit_summary.jrxml @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@ - + - - - -