Bugfix Flächendiagramm #3

src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen_ba_ma_sankey.sql

@@ -1,6 +1,12 @@
 --Freemarker Template
 --Achtung: Macro fügt Inhalte ein
 --Bitte nur Freemarker Variablen füllen
+<sqlvars>
+    <sqlvar name="viz_installed">
+        select count(*) from db_version where his_system ='viz';
+    </sqlvar>
+</sqlvars>
+
 
 <#assign masken = [
 {"mask":"30190", "filename":"30190_html_chart_sankey.xsl", "ord":"130"}
@@ -16,9 +22,13 @@
 }
 ] />
 <#assign stylesheet_field = [
+{"filename":"30190_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschluss"},
+{"filename":"30190_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschluss"},
+{"filename":"30190_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"summe"}
 
 ] />
 
+ <#if viz_installed==1>
 --Hier eventuell notwendige delete's auf die Tabellen sx_mask_style, sx_stylesheets oder stylesheet_field einfügen.
 
 --Achtung: ab hier nicht ändern, Mutterdatei ist $SUPERX_DIR/db/module/sos/schluesseltabellen/sx_stylesheets_fuellen.sql
@@ -28,6 +38,7 @@ m_stylesheet=stylesheet
 m_stylesheet_field=stylesheet_field
 />
 
+</#if>
 
 <#macro sx_stylesheets_insert m_masken m_stylesheet m_stylesheet_field>
 

src-modules/module/viz/schluesseltabellen/viz_type_property.unl

@@ -7,23 +7,22 @@
 13^3^72^1^10^
 15^5^72^1^10^
 16^6^70^1^0^
-17^6^72^1^0^
+17^6^72^1^10^
 20^1^76^0^20^
 22^2^76^0^20^
-24^5^80^0^20^
+24^5^76^0^20^
 26^3^76^0^20^
-27^6^88^0^0^
-29^6^89^0^0^
+27^6^76^0^20^
 33^7^70^1^0^
 34^7^72^0^0^
 35^9^70^0^0^
 36^9^72^1^0^
-37^8^80^0^0^
-38^8^72^1^0^
+37^8^76^0^20^
+38^8^72^1^10^
 39^8^70^1^0^
 41^10^70^0^0^
 42^10^72^0^10^
-43^10^79^1^20^
+43^10^76^0^20^
 44^11^95^1^0^
 45^11^73^1^0^
 46^12^73^1^20^
@@ -355,7 +354,7 @@
 372^10^43^0^306^
 373^10^45^0^308^
 374^10^56^0^401^
-375^10^57^0^402^
+375^10^79^0^40^
 376^10^58^0^403^
 377^10^60^0^304^
 378^10^61^0^301^

superx/xml/30190_html_chart_sankey.xsl

@@ -81,7 +81,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
 <xsl:text><![CDATA[
 function createViewer()
 {
-var myChartModelStr="{\"version\":\"0.2b\",\"id\":1,\"name\":\"\",\"renderer\":\"d3js\",\"dataSources\":[{\"value\":\"0\",\"nr\":1,\"name\":\"Tab. 1\",\"isDefault\":true}],\"targetDiv\":\"\",\"chartElements\":[{\"nr\":0,\"vizTypeUniquename\":\"sankey\",\"caption\":\"sankey\",\"datasource\":\"0\",\"elementTypeProperties\":[{\"nr\":0,\"vizTypePropertyUniquename\":\"dimension1\",\"caption\":\"Dimension 1\",\"propertyValue\":\"abschluss_vorher_abschluss_str\"},{\"nr\":0,\"vizTypePropertyUniquename\":\"dimension2\",\"caption\":\"Dimension 2\",\"propertyValue\":\"einschr_nachher_abschluss_str\"},{\"nr\":0,\"vizTypePropertyUniquename\":\"measure1\",\"caption\":\"Maß 1\",\"propertyValue\":\"count\"}]}],\"chartPropertiesUsed\":[{\"name\":\"caption\",\"vizPropertyVariablename\":\"caption\",\"propertyValue\":\"Übergang BA-MA Datenblatt\"},{\"name\":\"height\",\"vizPropertyVariablename\":\"height\",\"propertyValue\":\"850\",\"propUnit\":\"\"},{\"name\":\"width\",\"vizPropertyVariablename\":\"width\",\"propertyValue\":\"950\",\"propUnit\":\"\"},{\"name\":\"marginLeft\",\"vizPropertyVariablename\":\"marginLeft\",\"propertyValue\":\"100\",\"propUnit\":\"\"},{\"name\":\"backgroundColor\",\"vizPropertyVariablename\":\"backgroundColor\",\"propertyValue\":\"#ffffff\",\"propUnit\":\"\"},{\"name\":\"color\",\"vizPropertyVariablename\":\"color\",\"propertyValue\":\"#000000\",\"propUnit\":\"\"},{\"name\":\"fill_static\",\"vizPropertyVariablename\":\"fill\",\"propertyValue\":\"#000000\",\"propUnit\":\"\"},{\"name\":\"line_y\",\"vizPropertyVariablename\":\"line\",\"propertyValue\":\"true\",\"propUnit\":\"\"},{\"name\":\"line_x\",\"vizPropertyVariablename\":\"line\",\"propertyValue\":\"true\",\"propUnit\":\"\"}]}";
+var myChartModelStr="{\"version\":\"0.2b\",\"id\":1,\"name\":\"\",\"renderer\":\"d3js\",\"dataSources\":[{\"value\":\"0\",\"nr\":1,\"name\":\"Tab. 1\",\"isDefault\":true}],\"targetDiv\":\"\",\"chartElements\":[{\"nr\":0,\"vizTypeUniquename\":\"sankey\",\"caption\":\"sankey\",\"datasource\":\"0\",\"elementTypeProperties\":[{\"nr\":0,\"vizTypePropertyUniquename\":\"dimension1\",\"caption\":\"Dimension 1\",\"propertyValue\":\"erfolg_ba_ma_uebergang_abschluss_vorher_abschluss_str\"},{\"nr\":0,\"vizTypePropertyUniquename\":\"dimension2\",\"caption\":\"Dimension 2\",\"propertyValue\":\"erfolg_ba_ma_uebergang_einschr_nachher_abschluss_str\"},{\"nr\":0,\"vizTypePropertyUniquename\":\"measure1\",\"caption\":\"Maß 1\",\"propertyValue\":\"erfolg_ba_ma_uebergang_summe\"}]}],\"chartPropertiesUsed\":[{\"name\":\"caption\",\"vizPropertyVariablename\":\"caption\",\"propertyValue\":\"Übergang BA-MA Datenblatt\"},{\"name\":\"height\",\"vizPropertyVariablename\":\"height\",\"propertyValue\":\"850\",\"propUnit\":\"\"},{\"name\":\"width\",\"vizPropertyVariablename\":\"width\",\"propertyValue\":\"950\",\"propUnit\":\"\"},{\"name\":\"marginLeft\",\"vizPropertyVariablename\":\"marginLeft\",\"propertyValue\":\"100\",\"propUnit\":\"\"},{\"name\":\"backgroundColor\",\"vizPropertyVariablename\":\"backgroundColor\",\"propertyValue\":\"#ffffff\",\"propUnit\":\"\"},{\"name\":\"line_y\",\"vizPropertyVariablename\":\"line\",\"propertyValue\":\"true\",\"propUnit\":\"\"},{\"name\":\"line_x\",\"vizPropertyVariablename\":\"line\",\"propertyValue\":\"true\",\"propUnit\":\"\"}],\"dataTransformation\":[]}";
 myChartModel=JSON.parse(myChartModelStr);
 renderChart('chartDiv2',myChartModel);
 }

superx/xml/pageComponents_html_final_viz.xsl.sam

@@ -347,14 +347,16 @@ document.forms[0].target = '_blank';
 				
 				
 <!-- druckversion übergibt maxoffset 10000000 damit alle Sätze angezeigt werden -->
-	<a onMouseOver="window.status='Export starten';return true" onFocus="window.status='Download starten';return true" onMouseOut="window.status='Download starten';return true"><xsl:attribute name="href"><xsl:text>javascript:prepareExportChart()</xsl:text>
+	<a onMouseOver="window.status='Export starten';return true" onFocus="window.status='Download starten';return true"
+	onMouseOut="window.status='Download starten';return true"
+	class="linkLookImage"><xsl:attribute name="href"><xsl:text>javascript:prepareExportChart()</xsl:text>
 	</xsl:attribute>
 	
 	<!-- <xsl:attribute name="title"><xsl:text>Druckversion</xsl:text></xsl:attribute>
 	<xsl:text>Druckversion</xsl:text> -->
 	<input type="hidden" name="usetreetable" />
 	<img title="Ausgabe als Diagramm" alt="Ausgabe in Grafik"
-		src="../xml/his1/images/icons/chart_pie.svg" border="0" width="16px" height="16px" /><!--chart-bar.svg-->
+		src="../images/icons/no_image_large_mono.svg" border="0" width="16px" height="16px"  class="svg_icon"/><!--chart-bar.svg-->
 	</a>
 	<span class="separator">&#160;</span>