From a63156f7ff8d56a3fa9beafc8d084ce359995bd2 Mon Sep 17 00:00:00 2001
From: Marlies Winterstein <winterstein@superx-projekt.de>
Date: Tue, 9 May 2023 14:51:47 +0200
Subject: [PATCH] =?UTF-8?q?Dimensionen=20Pr=C3=BCfungsstatus,=20Fachsemest?=
 =?UTF-8?q?er=20eingebaut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcube/schluesseltabellen/#Untitled-1#     |  3 ---
 .../schluesseltabellen/xcube_install.sql      | 20 +++++++++++++++++--
 .../xcube_install_restrictions.sql            |  4 ++--
 3 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 src-modules/module/xcube/schluesseltabellen/#Untitled-1#

diff --git a/src-modules/module/xcube/schluesseltabellen/#Untitled-1# b/src-modules/module/xcube/schluesseltabellen/#Untitled-1#
deleted file mode 100644
index 8c61274..0000000
--- a/src-modules/module/xcube/schluesseltabellen/#Untitled-1#
+++ /dev/null
@@ -1,3 +0,0 @@
-"attrib_nachbearbeitung":"update <<tmp_table>> set <<col>>='-1' where <<col>> <0.00"
-
-"vcsql":"update tmp_rohdaten set dauer_rsz= nvl(fach_sem_zahl -(select regel from dim_studiengang where tid=tid_stg),0)",
diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql
index 0dcf8ad..9cea848 100644
--- a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql
+++ b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql
@@ -309,7 +309,23 @@
       "foreignkey_cond":"id='dauer_rsz'",
       "attrib_nachbearbeitung":"update <<tmp_table>> set <<col>>='-1' where <<col>>::numeric(5,2) <0.00;update <<tmp_table>> set <<col>>=<<col>>::numeric(5,2)::integer::varchar(10) where <<col>>::numeric(5,2) >=0.00 and <<col>>::numeric(5,2)< 2.00;update <<tmp_table>> set <<col>>='2' where <<col>>::numeric(5,2) >=2.00", 
       "sortfield":"sort1"},
-      
+     {"maskeninfo_id":21100, 
+    "name":"fach_sem_zahl",
+    "caption":"Fachsemester",
+    "is_rowdefault":1,
+    "foreignkey_tab":"xcube_dims",
+    "foreignkey_col":"apnr",
+    "foreignkey_cap":"name",
+    "foreignkey_cond":"id='fssemzahl'",
+    "attrib_nachbearbeitung": "update <<tmp_table>> set <<col>>=<<col>>::numeric(10,2)::integer::char where <<col>>::numeric(10,2) < 11.00;update <<tmp_table>> set <<col>>='99' where <<col>>::numeric(10,2) >= 11.00",
+    "sortfield":"sort1"},
+     {"maskeninfo_id":21100,
+      "name":"pstatus", 
+      "caption":"Prüfungsstatus",
+      "foreignkey_tab":"sos_k_pstatus",
+      "foreignkey_col":"apnr::varchar(255)",
+      "foreignkey_cap":"druck",
+      "sortfield":"druck"}, 
       
       <#-- Primärbuchungswürfel -->
       {"maskeninfo_id":21500,
@@ -346,7 +362,7 @@
       "name":"projnr", 
       "caption":"Kostenträger",
       "is_sicht":1 }
-      
+            
 ] />
 
 
diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql
index 840fd12..7aa8649 100644
--- a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql
+++ b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql
@@ -21,8 +21,7 @@ update xcube set restriction='<<Köpfe oder Fälle ?>>
   
  'abschnitt = 2
  --alle normalen Abfragen joinen mit lehr_stg_ab, deshalb sicherheitshalber
- and tid_stg in (select tid from lehr_stg_ab)
- and pstatus = <<Prüfungsstatus>>
+  /* and pstatus = <<Prüfungsstatus>> */
  and <<Köpfe oder Fälle ?>>
   and sem_der_pruefung >= <<Seit Semester>>
   /* and sem_der_pruefung <= <<Bis Semester>>*/
@@ -33,6 +32,7 @@ update xcube set restriction='<<Köpfe oder Fälle ?>>
   /* and geschlecht=<<Geschlecht>> */
     <#if "<<Alter>>"!=""> and ${Alter.selectedItems[0].strukturStr?replace("$1","alter")}</#if>
     <#if "<<Note>>"!=""> and ${.vars["Note"].selectedItems[0].strukturStr?replace("$1","note")}</#if>
+  /* AND fach_sem_zahl <= <<bis Fachsemester>> */
   ' where maskeninfo_id=21100;
   
  update xcube set restriction='