SuperX
/
rpta
7
0
Fork 0
Code Issues 19 Pull Requests Projects Releases Wiki Activity
Browse Source

Bugfix Personal-Spaltenleyouts Spaltentyp #13

master
Daniel Quathamer 2 days ago
parent
a52788d30b
commit
b39c684d7e
8 changed files with 69 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src-modules/module/rpta/masken/48110_maskeninfo.unl
  2. 2
      src-modules/module/rpta/masken/48180_maskeninfo.unl
  3. 2
      src-modules/module/rpta/masken/48220_maskeninfo.unl
  4. 4
      src-modules/module/rpta/masken/48250_felderinfo.unl
  5. 4
      src-modules/module/rpta/masken/48250_maskeninfo.unl
  6. 2
      src-modules/module/rpta/masken/48280_maskeninfo.unl
  7. 2
      src-modules/module/rpta/masken/48310_maskeninfo.unl
  8. 60
      superx/xml/rpta_assistent.xsl

2
src-modules/module/rpta/masken/48110_maskeninfo.unl
Unescape View File

@ -109,4 +109,4 @@ Column CID=0 heading_text="${column.caption}" center_heading explanation="${colu
width=${column.visible_width} text_size=60\ width=${column.visible_width} text_size=60\
</#if>\ </#if>\
</#foreach>\ </#foreach>\
@@@^Studienfach^Anzahl bzw. Anteil^Leistungen und Studiengänge^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^ @@@^Studienfach^Anzahl bzw. Anteil^Leistungen und Studiengänge^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

2
src-modules/module/rpta/masken/48180_maskeninfo.unl
Unescape View File

@ -271,4 +271,4 @@ Column CID=0 heading_text="${column.caption}" center_heading explanation="${colu
width=${column.visible_width} text_size=60\ width=${column.visible_width} text_size=60\
</#if>\ </#if>\
</#foreach>\ </#foreach>\
@@@^Studienfach^Anzahl bzw. Anteil^Datenblatt Studierendenstatistik^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^ @@@^Studienfach^Anzahl bzw. Anteil^Datenblatt Studierendenstatistik^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

2
src-modules/module/rpta/masken/48220_maskeninfo.unl
Unescape View File

@ -163,4 +163,4 @@ Column CID=0 heading_text="${column.caption}" center_heading explanation="${colu
width=${column.visible_width} text_size=60\ width=${column.visible_width} text_size=60\
</#if>\ </#if>\
</#foreach>\ </#foreach>\
@@@^^^Übersicht über vorberechnete Kennzahlen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^1^600^360^0^^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^ @@@^^^Übersicht über vorberechnete Kennzahlen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^1^600^360^0^^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

4
src-modules/module/rpta/masken/48250_felderinfo.unl
Unescape View File

@ -10,13 +10,13 @@ select C.uniquename, C.caption ,L.layout_id from rpta_column C, rpta_column2layo
48257^Filter Personal^120^310^-1^100^300^1^sql^20^0^1^<<SQL>> select id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SVA_PERS_FILTER' order by 2;^^^ 48257^Filter Personal^120^310^-1^100^300^1^sql^20^0^1^<<SQL>> select id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SVA_PERS_FILTER' order by 2;^^^
48258^Kostenstelle (Person)^70^350^-1^150^150^1^char^30^0^12^<<SQL>> select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht','SVA-Kst-spezial') and aktiv=1 order by sortnr,type,name;^hidden^^ 48258^Kostenstelle (Person)^70^350^-1^150^150^1^char^30^0^12^<<SQL>> select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht','SVA-Kst-spezial') and aktiv=1 order by sortnr,type,name;^hidden^^
48259^Alter (bis)^21^170^-1^100^70^1^integer^5^0^0^^^^ 48259^Alter (bis)^21^170^-1^100^70^1^integer^5^0^0^^^^
48260^Spaltenlayout^3000^350^-1^140^180^1^integer^50^1^1^<<SQL>>SELECT tid,\ 48260^Spaltenlayout^3000^350^-1^140^180^1^char^50^1^1^<<SQL>>SELECT uniquename,\
caption\ caption\
FROM rpta_column_layout \ FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sva_pbv_aggr_pgd'\ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sva_pbv_aggr_pgd'\
and R.systeminfo_id=6)\ and R.systeminfo_id=6)\
order by sortnr, caption\ order by sortnr, caption\
;^^<<SQL>>SELECT tid,\ ;^^<<SQL>>SELECT uniquename,\
caption\ caption\
FROM rpta_column_layout \ FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sva_pbv_aggr_pgd'\ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sva_pbv_aggr_pgd'\

4
src-modules/module/rpta/masken/48250_maskeninfo.unl
Unescape View File

@ -39,7 +39,7 @@ select L.uniquename,\
from rpta_resultset R, rpta_column_layout L\ from rpta_resultset R, rpta_column_layout L\
where L.resultset_id=R.tid\ where L.resultset_id=R.tid\
and R.uniquename='${basetable.name}'\ and R.uniquename='${basetable.name}'\
and L.tid=<<Spaltenlayout>>;\ and L.uniquename=<<Spaltenlayout>>;\
\ \
]]></sqlvar>\ ]]></sqlvar>\
<sqlvar name="columns" type="hashsequence"><![CDATA[\ <sqlvar name="columns" type="hashsequence"><![CDATA[\
@ -59,7 +59,7 @@ left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
where L.tid=CL.layout_id\ where L.tid=CL.layout_id\
and C.tid=CL.column_id\ and C.tid=CL.column_id\
and T.tid=C.column_type\ and T.tid=C.column_type\
and L.tid=<<Spaltenlayout>>\ and L.uniquename=<<Spaltenlayout>>\
/* and C.uniquename in (<<Spalten>>) */\ /* and C.uniquename in (<<Spalten>>) */\
order by CL.sortnr\ order by CL.sortnr\
;\ ;\

2
src-modules/module/rpta/masken/48280_maskeninfo.unl
Unescape View File

@ -139,4 +139,4 @@ Column CID=0 heading_text="${column.caption}" center_heading explanation="${colu
width=${column.visible_width} text_size=60\ width=${column.visible_width} text_size=60\
</#if>\ </#if>\
</#foreach>\ </#foreach>\
@@@^ ^ ^Übersicht über vorberechnete Kennzahlen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^1^600^360^^0^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^ @@@^ ^ ^Übersicht über vorberechnete Kennzahlen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^1^600^360^^0^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

2
src-modules/module/rpta/masken/48310_maskeninfo.unl
Unescape View File

@ -199,4 +199,4 @@ Column CID=0 heading_text="sortnr" center_heading explanation=""\
row_selectable heading_platform readonly\ row_selectable heading_platform readonly\
width=5 text_size=60\ width=5 text_size=60\
</#if>\ </#if>\
@@@^Studienfach^Anzahl bzw. Anteil^Übergang nach Abschluss zu einem neuen Studiengang oder vorheriger Abschluss bei Studienbeginn^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^ @@@^Studienfach^Anzahl bzw. Anteil^Übergang nach Abschluss zu einem neuen Studiengang oder vorheriger Abschluss bei Studienbeginn^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

60
superx/xml/rpta_assistent.xsl
Unescape View File

@ -1116,22 +1116,47 @@ function deeplink_dialog()
<xsl:template name="rpta"> <xsl:template name="rpta">
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
function setPageFormat(selectFormat) function setPageFormat()
{ {
var frmFieldX=document.forms[0].elements["RPTPageFormatX"]; var frmFieldX=document.forms[0].elements["RPTPageFormatX"];
var frmFieldY=document.forms[0].elements["RPTPageFormatY"]; var frmFieldY=document.forms[0].elements["RPTPageFormatY"];
var selectFormat=document.forms[0].elements["RPTPageFormat"].value;
var selectOrientation=document.forms[0].elements["RPTPageOrientation"].value;
switch (selectFormat.value) { switch (selectFormat.value) {
case "A4": case "A4":
if(selectOrientation=="quer"){
frmFieldX.value="842"; frmFieldX.value="842";
frmFieldY.value="595"; frmFieldY.value="595";
}
else
{
frmFieldX.value="595";
frmFieldY.value="842";
}
break; break;
case "A3": case "A3":
if(selectOrientation=="quer"){
frmFieldX.value="1191"; frmFieldX.value="1191";
frmFieldY.value="842"; frmFieldY.value="842";
}
else
{
frmFieldX.value="842";
frmFieldY.value="1191";
}
break; break;
case "A0": case "A0":
if(selectOrientation=="quer"){
frmFieldX.value="3370"; frmFieldX.value="3370";
frmFieldY.value="2384"; frmFieldY.value="2384";
}
else
{
frmFieldX.value="2384";
frmFieldY.value="3370";
}
break; break;
default: default:
//A4 //A4
@ -1189,7 +1214,7 @@ switch (selectFormat.value) {
<div class="control is-expanded"> <div class="control is-expanded">
<!--<div class="control">--><!--141024BF deaktiviert--> <!--<div class="control">--><!--141024BF deaktiviert-->
<div class="select is-small is-fullwidth is-focused"> <div class="select is-small is-fullwidth is-focused">
<select name="RPTPageFormat" onChange="setPageFormat(this);"> <select name="RPTPageFormat" onChange="setPageFormat();">
<option value="A4" selected="selected">DIN A 4</option> <option value="A4" selected="selected">DIN A 4</option>
<option value="A3" >DIN A 3</option> <option value="A3" >DIN A 3</option>
<option value="A0" >DIN A 0</option> <option value="A0" >DIN A 0</option>
@ -1211,7 +1236,38 @@ switch (selectFormat.value) {
<input name="RPTPageFormatY" type="hidden" value="595" /> <input name="RPTPageFormatY" type="hidden" value="595" />
</div><!--Ende field is-grouped--> </div><!--Ende field is-grouped-->
<div class="field is-grouped">
<div class="label-container">
<span class="labelPflicht">Ausrichtung</span>
</div>
<div class="control-new">
<div class="field has-addons">
<div class="control is-expanded">
<!--<div class="control">--><!--141024BF deaktiviert-->
<div class="select is-small is-fullwidth is-focused">
<select name="RPTPageOrientation" onChange="setPageFormat();">
<option value="quer" selected="selected">Querformat</option>
<option value="hoch" >Hochformat</option>
</select>
</div>
</div>
<div class="control">
<button class="button is-small is-rounded has-tooltip-bottom"
data-tooltip="Wählen Sie hier das Seitenformat, standardmäßig ist die eine Druckseite A3">
<span class="icon" aria-hidden="true"><img src="../images/information_grey_liberation.svg" alt="Info" title="Info" />
</span>
</button>
</div>
<!--</div>--><!--141024BF deaktiviert-->
</div> <!--Ende field has-addons-->
</div> <!--Ende control-new-->
<input name="RPTPageFormatX" type="hidden" value="842" />
<input name="RPTPageFormatY" type="hidden" value="595" />
</div><!--Ende field is-grouped-->
<div class="field is-grouped"> <div class="field is-grouped">
<div class="label-container"> <div class="label-container">
<span class="labelPflicht">Ausgabeformat</span> <span class="labelPflicht">Ausgabeformat</span>

Write Preview
Loading…
Cancel
Save