Semester über cif statt kenn_semester

src-modules/module/sxc/masken/47000_felderinfo.unl

@@ -1,3 +1,39 @@
 47000^Hochschule^0^0^0^100^150^1^char^30^0^12^<<SQL>>  select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht')  and aktiv=1 order by sortnr, name;^^ ^
-47001^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid  limit 1^
-47007^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^ ^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC limit 1;^
+47001^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC\
+;^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
+47007^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC\
+;^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^

src-modules/module/sxc/masken/47030_felderinfo.unl

@@ -1,6 +1,42 @@
 47030^Hochschule^0^0^0^100^150^3^char^30^0^12^<<SQL>> select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht') order by sortnr, name;^^ ^
-47031^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid  limit 1^
-47032^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^ ^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC limit 1;^
+47031^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC\
+;^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
+47032^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC\
+;^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
 47041^Geschlecht^37^0^0^140^80^1^char^30^0^1^<<SQL>> select apnr, name from xcube_dims where id='geschlecht_w' order by 1^^^
 47042^Felder^125^0^0^150^190^10^char^30^0^999^<<SQL>>\
 --freemarker template\

src-modules/module/sxc/masken/47090_felderinfo.unl

@@ -1,5 +1,23 @@
 47090^Hochschule^10^0^0^100^150^1^char^30^0^12^<<SQL>>  select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht') and name_intern like 'sxc_hochschulen_nrw%' and aktiv=1 order by sortnr, name;^^ ^
-47091^Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester order by tid DESC;^^<<SQL>> select tid,druck from kenn_semester where today() between sem_beginn  and sem_ende;^
+47091^Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC\
+;^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
 47092^Abschluss^40^0^0^100^200^5^char^30^0^1^<<SQL>> select astat, dtxt from kenn_abschl_astat where struktur_c='Abschluss (amtlich)' order by 2;^^^
 47093^Hochschulart^15^0^0^170^200^1^integer^30^0^1^<<SQL>> select laufnummer,bezeichnung from sxc_hsk_hochschultypen order by 1^ ^ ^
 47094^Stichwort^60^0^0^170^100^1^char^30^0^0^^^ ^