Compare commits

..

No commits in common. 'ff3bb4c9daf7e8fa51108ce282ede5232c855984' and 'ac64704b116bfd344df3b93155af143acec35557' have entirely different histories.

  1. 2
      src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
  2. 2
      src-modules/module/rpta/masken/48430_felderinfo.unl
  3. 69
      src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql
  4. 36
      superx/WEB-INF/reports/simple_table.jrtx
  5. 1
      superx/xml/rpta_groupLayout.xml
  6. 8
      superx/xml/rpta_templates.xsl

2
src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql

@ -58,7 +58,7 @@ SELECT @@ -58,7 +58,7 @@ SELECT
elementnr,
summe,
<#if TableFieldExists?exists && TableFieldExists('lm_exam_unit','shortcomment')>
substring(shortcomment from 1 for 255) as shortcomment,
shortcomment,
<#else>
null::varchar(255) as shortcomment,
</#if>

2
src-modules/module/rpta/masken/48430_felderinfo.unl

@ -14,7 +14,7 @@ and R.systeminfo_id=130);^ @@ -14,7 +14,7 @@ and R.systeminfo_id=130);^
(select case when tid % 10 = 1 then tid+1 else tid+9 end from semester where today() between sem_beginn and sem_ende)) \
from semester \
where today() between sem_beginn and sem_ende;^
48432^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
48432^Fächer^30^0^0^130^200^6^integer^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
48433^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
48434^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^999^^ ^ ^
48435^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^ ^

69
src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql

@ -9,23 +9,6 @@ select name @@ -9,23 +9,6 @@ select name
</sqlvar>
<sqlvar name="added_tables" type="hashsequence">
select 10::smallint as sortnr,
name, trim(name) ||'_' as prefix,
caption,
'zul_antr_aggr.stg=zul_k_stg.apnr' as joinclause
from sx_tables where name in ('zul_k_stg')
union
select 20::smallint as sortnr,
name, trim(name) ||'_' as prefix,
caption,
'zul_antr_aggr.abschl=zul_k_abint.apnr' as joinclause
from sx_tables where name in ('zul_k_abint')
union
select 30::smallint as sortnr,
name, trim(name) ||'_' as prefix,
caption,
'zul_antr_aggr.stort=zul_k_stort.apnr' as joinclause
from sx_tables where name in ('zul_k_stort')
</sqlvar>
<sqlvar name="fields_target" type="hashsequence"><![CDATA[
@ -91,37 +74,23 @@ foreignkey_uniquename VARCHAR(255) @@ -91,37 +74,23 @@ foreignkey_uniquename VARCHAR(255)
--Vorbereitung:
UPDATE sx_tables
SET caption = 'Abschlüsse'
WHERE name='zul_k_abint';
update sx_fields set caption='Schlüssel Abschluss'
where table_name='zul_k_abint'
and name='apnr';
update sx_fields set caption='Bezeichnung Abschluss'
where table_name='zul_k_abint'
and name='druck';
update sx_fields set caption='Amtlicher Schlüssel Abschluss'
where table_name='zul_k_abint'
and name='astat';
update sx_fields set currentlyused=0
where table_name='zul_k_abint'
and name='tid';
UPDATE sx_tables
SET caption = 'Standorte'
WHERE name='zul_k_stort';
update sx_fields set caption='Schlüssel Standort'
where table_name='zul_k_stort'
and name='apnr';
update sx_fields set caption='Bezeichnung Standort'
where table_name='zul_k_stort'
and name='druck';
update sx_fields set caption='Kurztext Abschluss'
where table_name='zul_k_stort'
and name='kurz';
update sx_fields set currentlyused=0
where table_name='zul_k_stort'
and name='tid';
-- UPDATE sx_tables
-- SET caption = 'Institution'
-- WHERE name='man_organigramm';
-- UPDATE sx_tables
-- SET caption = 'Studienart'
-- WHERE name = 'sos_k_stuart';
-- UPDATE sx_tables
-- SET caption = 'Studiumstyp'
-- WHERE name = 'sos_k_stutyp';
-- UPDATE sx_tables
-- SET caption = 'Studienform'
-- WHERE name = 'sos_k_stufrm';
-- UPDATE sx_tables
-- SET caption = 'Hörerstatus'
-- WHERE name = 'sos_k_hrst';
--drop view if exists sos_stud_astat;
@ -130,11 +99,11 @@ update sx_fields set currentlyused=0 @@ -130,11 +99,11 @@ update sx_fields set currentlyused=0
update sx_fields set
is_sum=0
where table_name='zul_antr_aggr'
and name not in ('summe');
and name not in ('value','value1','value2');
update sx_fields set
is_sum=1
where table_name='zul_antr_aggr'
and name in ('summe');
and name in ('value','value1','value2');
insert into tmp_tables (

36
superx/WEB-INF/reports/simple_table.jrtx

@ -65,40 +65,4 @@ @@ -65,40 +65,4 @@
</box>
<paragraph spacingBefore="0" spacingAfter="0"/>
</style>
<style name="TableRowStandard" style="Standard Bodytext" mode="Opaque" forecolor="#050505" backcolor="#FFFFFF" hTextAlign="Right" fontSize="8" isBold="false">
<pen lineWidth="1.0" lineStyle="Solid" lineColor="#030000"/>
<box leftPadding="3" rightPadding="3">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#050505"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#050505"/>
</box>
</style>
<style name="TableRowLevel2header" mode="Opaque" forecolor="#FFFFFF" backcolor="#B5172B" fontSize="9" isBold="true">
<pen lineWidth="1.0" lineStyle="Solid" lineColor="#030000"/>
<box topPadding="4" leftPadding="3" rightPadding="3">
<topPen lineWidth="1.0" lineStyle="Double" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
</style>
<style name="TableRowLevel2footer" mode="Opaque" backcolor="#EBEBED" fontSize="9" isBold="false">
<pen lineWidth="1.0" lineStyle="Solid" lineColor="#030000"/>
<box leftPadding="3" rightPadding="3">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
</style>
<style name="TableRowLevel1footer" mode="Opaque" backcolor="#EBEBED" fontSize="9" isBold="true">
<pen lineWidth="1.0" lineStyle="Solid" lineColor="#030000"/>
<box leftPadding="3" rightPadding="3">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
</style>
</jasperTemplate>

1
superx/xml/rpta_groupLayout.xml

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<groupLayout>
<group name="tabellennr" level="1" showFooter="false" />
</groupLayout>

8
superx/xml/rpta_templates.xsl

@ -694,7 +694,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.--> @@ -694,7 +694,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.-->
<xsl:param name="colId" />
<xsl:param name="x" select="'0'" />
<xsl:param name="width" select="'0'" />
<xsl:param name="height" select="$std_zeilenhoehe_tablerow" />
<xsl:param name="height" select="'30'" />
<xsl:param name="flavorTableRowStyle" select="'listAlternatingBg'" />
<xsl:param name="tableRowLevel" select="10" />
<xsl:param name="expressionType" select="'F'" />
@ -764,7 +764,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.--> @@ -764,7 +764,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.-->
<xsl:attribute name="evaluationGroup"><xsl:value-of select="$groupbyField"/></xsl:attribute>
</xsl:if>
<!--{$height}30 -->
<reportElement stretchType="ContainerHeight" x="{$x}" y="0" width="{$width}" height="{$height}" >
<reportElement stretchType="ContainerHeight" x="{$x}" y="0" width="{$width}" height="14" >
<xsl:attribute name="style">
<xsl:call-template name="getTableRowStyle" >
<xsl:with-param name="flavorTableRowStyle" select="$flavorTableRowStyle"/>
@ -1068,7 +1068,7 @@ genommen. Wenn nicht, wird mit colspan multipliziert.--> @@ -1068,7 +1068,7 @@ genommen. Wenn nicht, wird mit colspan multipliziert.-->
<xsl:variable name="legendLabelHeight" select="20" />
<xsl:variable name="legendContentHeight" select="10" />
<xsl:variable name="hinweisContentHeight" select="10" />
<xsl:if test="$groupbyField != ''">
<group name="{$groupbyField}" keepTogether="true">
<groupExpression><xsl:value-of select="concat('$F{',$groupbyField,'}')"/></groupExpression>
@ -1109,9 +1109,7 @@ genommen. Wenn nicht, wird mit colspan multipliziert.--> @@ -1109,9 +1109,7 @@ genommen. Wenn nicht, wird mit colspan multipliziert.-->
</band>
</groupFooter>
</xsl:if>
</group>
</xsl:if>
</xsl:template>
<xsl:template name="generateGroupBandContent">
<xsl:param name="ergebniselementOrdnr" select="0" />

Loading…
Cancel
Save