NRW-Schnitt angepasst

src-modules/module/rpta/conf/rpta.xml

@@ -104,7 +104,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
 		<column name="description" type="TEXT" size="255" default=""	notnull="" description="Beschreibung" ><comment>Erläuterungstext</comment></column>
 		<column name="userinfo_id" type="INTEGER" size="255" default=""	notnull="" description="Angelegt von" ></column>
 		<column name="sortnr" type="INTEGER" size="255" default=""	notnull="" description="Sortiernummer" sortable="true"><comment>Kann leer bleiben, wenn nach Bezeichnung sortiert wird.</comment></column>
-		<column name="sortclause" type="TEXT" size="255" default=""	notnull="false" description="Bedingung (order by)" />	
+		<column name="sortclause" type="TEXT" size="255" default=""	notnull="false" description="Sortierung (order by)" />	
 		<column name="is_virtual" type="SMALLINT" size="255" default="1" notnull="true" description="Virtuelle Tabelle" ><comment>1=ja,0=nein. Bei 0 wird es nachts berechnet</comment></column>
 	</columns>
 	<primaryKeys><rs>

src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql

@@ -124,39 +124,26 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"nrw_schnitt_lfb_dec",
+{"uniquename":"nrw_schnitt_kennz_lookup",
-"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt pro LFB",
-"caption_in_ergebnistabelle":"NRW-Durchschnitt",
-"srcfieldname":"",
-"targetfieldname":"nrw_schnitt_lfb",
-"column_type":"preparingColumn",
-"col_function":"generic_dim2::decimal(30,20)",
-"is_visible":"0",
-"visible_size":"10",
-"is_aggregate":"0",
-"description":""
-},
-{"uniquename":"nrw_schnitt_lfb_summe",
-"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt pro LFB summiert",
-"caption_in_ergebnistabelle":"NRW-Durchschnitt",
-"srcfieldname":"nrw_schnitt_lfb",
-"targetfieldname":"nrw_schnitt_lfb_summe",
-"column_type":"processingColumn",
-"col_function":"sum(nrw_schnitt_lfb)",
-"is_visible":"0",
-"visible_size":"10",
-"is_aggregate":"1",
-"description":""
-},
-{"uniquename":"nrw_schnitt_kennz",
 "caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt der Kennzahl",
 "caption_in_ergebnistabelle":"NRW-Durchschnitt",
 "srcfieldname":"wert",
-"targetfieldname":"nrw_schnitt_kennz",
+"targetfieldname":"nrw_schnitt_kennz_lookup",
-"column_type":"computedColumn",
+"column_type":"lookupColumn",
-"col_function":"case when lfb_count>0 and kenn_katalog_id like ''%_quote%'' then nrw_schnitt_lfb_summe/lfb_count
+"col_function":"SELECT AVG(summe_wert) AS durchschnitt
-					when kenn_katalog_id not like ''%_quote%'' and kenn_katalog_id not like ''%_proz%'' then nrw_schnitt_lfb_summe
+				FROM (
-					else null end",
+					SELECT hs_nr, 
+						case when kenn_zahl like ''%_quote%'' then avg(wert)
+						when kenn_zahl not like ''%_quote%'' and kenn_zahl not like ''%_proz%'' then sum(wert)
+						else null end AS summe_wert
+					FROM sxc_zahl_wert
+					WHERE hs_nr IN (''1480'',''1140'',''1080'',''1090'',''1130'',''0080'',''1100'',''1110'',''1120'',''0121'',''0130'',''0140'')
+						AND kenn_zahl = tmp_rpta_sxc_zahl_wert.kenn_zahl
+						AND jahr = tmp_rpta_sxc_zahl_wert.jahr
+						AND wert IS NOT NULL
+					GROUP BY hs_nr,kenn_zahl
+				) AS summen_pro_hs
+",
 "is_visible":"1",
 "visible_size":"10",
 "is_aggregate":"0",