Layoutmerkmal gestapelteBalken, Labeloverlap

.gitignore

@@ -18,3 +18,4 @@ superx/WEB-INF/viz_dbforms-config_pg.xml
 *.tgz
 *.jasper
 
+/build/

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

@@ -1156,6 +1156,8 @@ detail_chart_uniquename  varchar(255)
 <action error="stop">
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/fm_templates_fuellen.sql" database=""/>
+</action>
+<action error="stop">
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql" database=""/>
 
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
@@ -1174,12 +1176,14 @@ detail_chart_uniquename  varchar(255)
 
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/konstanten_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/chart2layout_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_plot_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_plot_line_bar_boxplot_fuellen.sql" database=""/>
 
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_fuellen.sql" database=""/>
-<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_bar_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_line_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_pie_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_sankey_fuellen.sql" database=""/>
 
@@ -1361,6 +1365,8 @@ detail_chart_uniquename  varchar(255)
 <nativeaction sql="" scriptfile="$VIZ_PFAD/upgrade/viz_upgrade_man.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/fm_templates_fuellen.sql" database=""/>
+</action>
+<action error="stop">
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_colorscheme_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_chart_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql" database=""/>
@@ -1373,7 +1379,8 @@ detail_chart_uniquename  varchar(255)
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_plot_line_bar_boxplot_fuellen.sql" database=""/>
 
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_fuellen.sql" database=""/>
-<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_bar_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_line_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_pie_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_properties_echarts_sankey_fuellen.sql" database=""/>
 
@@ -1388,6 +1395,7 @@ detail_chart_uniquename  varchar(255)
 </action>
 <action error="stop">
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/chart2layout_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/studierende_datenblatt_dashboard.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_fak_fuellen.sql" database=""/>

src-modules/module/viz/masken/44720_maskeninfo.unl

@@ -26,48 +26,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-C.is_aggregate,\
-(case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
-CL.is_visible,\
-CL.visible_size as visible_width,\
-F.sql_code as format_sql,\
-F.uniquename as format_uniquename,\
-C.col_function as colfunction,\
-(case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
-left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
-where L.tid=CL.layout_id\
-and C.tid=CL.column_id\
-and T.tid=C.column_type\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\

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

@@ -26,7 +26,6 @@
 {"chart":"STUDANF_FAK_BAR", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
 {"chart":"STUDANF_FAK_BAR_X_ECHART", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
 {"chart":"STUDANF_FAK_BAR_Y_ECHART", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
-{"chart":"hms_torte_stud_fak", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
 {"chart":"STUD_FAK_KURZ_PIE", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
 {"chart":"STUD_FAK_KURZ_DONUT", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
 {"chart":"STUD_FAK_KURZ_DONUT_JB", "layout":"sos_stud_fak_dashboard", "caption":"", "sortnr":"20"},
@@ -44,11 +43,7 @@
 {"chart":"STUDANF_JAHR_LINE", "layout":"sos_stud_dashboard_jahr", "caption":"", "sortnr":"20"},
 
 {"chart":"simplePivotTable_44570", "layout":"sos_stud_sem_dashboard", "caption":"", "sortnr":"20"},
-{"chart":"STUD_SEM_LINE", "layout":"sos_stud_sem_dashboard", "caption":"", "sortnr":"20"},
-
-{"chart":"hms_saeule_stud_jahr_semestertyp", "layout":"sos_stud_sem_jahr", "caption":"", "sortnr":"20"}
-
-{"chart":"hms_saeule_absolv_jahr_semestertyp", "layout":"rpta_sos_lab_aggr_jahr_semtyp", "caption":"", "sortnr":"20"}
+{"chart":"STUD_SEM_LINE", "layout":"sos_stud_sem_dashboard", "caption":"", "sortnr":"20"}
 
 ] />
 

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

@@ -7,7 +7,7 @@ select count(*) from systeminfo where tid=330;
 </sqlvars>
 <#assign rpta_column_layout = 
 {"uniquename":"sos_stud_sem_jahr",
-"caption":"Studierende nach Studienjahr",
+"caption":"Studierende nach Studienjahr und Semestertyp",
 "rpta_resultset":"sos_stud_astat",
 "whereclause":"",
 "description":"Studierende nach Studienjahr"

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

@@ -23,9 +23,34 @@
 ]
 />
 
-
+--TODO klappt noch nicht: {"viz_property_uniquename":"stroke","is_mandatory":"0"}
 <#assign viz_type_properties = [
-{"viz_property_uniquename":"barStacked"}
+{"viz_property_uniquename":"x",
+"is_mandatory":"1"},
+{"viz_property_uniquename":"y",
+"is_mandatory":"1"},
+{"viz_property_uniquename":"stroke","is_mandatory":"0"},
+{"viz_property_uniquename":"xAxisNode"},
+{"viz_property_uniquename":"xAxisName"},
+{"viz_property_uniquename":"xAxisNameLocation"},
+{"viz_property_uniquename":"xAxisLabelNode"},
+{"viz_property_uniquename":"tickRotate_x"},
+{"viz_property_uniquename":"width_x"},
+{"viz_property_uniquename":"padding_x"},
+{"viz_property_uniquename":"fontsize_x"},
+{"viz_property_uniquename":"fontcolor_x"},
+{"viz_property_uniquename":"yAxisNode"},
+{"viz_property_uniquename":"yAxisName"},
+{"viz_property_uniquename":"yAxisLabelNode"},
+{"viz_property_uniquename":"tickRotate_y"},
+{"viz_property_uniquename":"width_y"},
+{"viz_property_uniquename":"padding_y"},
+{"viz_property_uniquename":"fontsize_y"},
+{"viz_property_uniquename":"fontcolor_y"},
+{"viz_property_uniquename":"singleColor"},
+{"viz_property_uniquename":"barStacked"},
+{"viz_property_uniquename":"seriesColorBy"}
+
 
 ]
 />

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

@@ -1,58 +0,0 @@
---Freemarker Template
---obsolet
-<#include "SQL_lingua_franca"/>
-<#include "SuperX_general"/>
-<#include "VIZ-Makros"/>
-<sqlvars>
-    <sqlvar name="renderer">
-        select tid from viz_renderer where uniquename='echarts';
-    </sqlvar>
-</sqlvars>
-<#assign viz_types = [
-{"uniquename":"echarts_bar_y_series", "caption":"Säulendiagramm mit Serien (vertikal)",
-"orientation":"V",
-"description":"Vertikales Balkendiagramm mit Serien",
-"explanation":""},
-{"uniquename":"echarts_line_y_series", "caption":"Liniendiagramm mit Serien (vertikal)",
-"orientation":"V",
-"description":"Vertikales Liniendiagramm mit Serien",
-"explanation":""}
-]
-/>
-
-
-<#assign viz_type_properties = [
-{"viz_property_uniquename":"stroke",
-"is_mandatory":"1"},
-{"viz_property_uniquename":"series_selection_line"},
-{"viz_property_uniquename":"series_selection_column"}
-{"viz_property_uniquename":"xAxisNode"},
-{"viz_property_uniquename":"xAxisName"},
-{"viz_property_uniquename":"xAxisLabelNode"},
-{"viz_property_uniquename":"tickRotate_x"},
-{"viz_property_uniquename":"width_x"},
-{"viz_property_uniquename":"padding_x"},
-{"viz_property_uniquename":"yAxisNode"},
-{"viz_property_uniquename":"yAxisName"},
-{"viz_property_uniquename":"xAxisNameLocation"},
-{"viz_property_uniquename":"yAxisLabelNode"},
-{"viz_property_uniquename":"tickRotate_y"},
-{"viz_property_uniquename":"width_y"},
-{"viz_property_uniquename":"padding_y"}
-]
-/>
-
-<@create_temp_tables />
-
-
-<#foreach viz_type in viz_types>
-
-<@fill_viz_types viz_type_p=viz_type />
-
-<@fill_viz_type_properties viz_type_p=viz_type />
-
-</#foreach>
-
-
-<@drop_temp_tables />
-

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

@@ -9,14 +9,6 @@
     </sqlvar>
 </sqlvars>
 <#assign viz_types = [
-{"uniquename":"echarts_bar_y", "caption":"Säulendiagramm (vertikal)",
-"orientation":"V",
-"description":"Vertikales Balkendiagramm",
-"explanation":""},
-{"uniquename":"echarts_bar_x", "caption":"Balkendiagramm (horizontal)",
-"orientation":"H",
-"description":"Horizontales Balkendiagramm",
-"explanation":""},
 {"uniquename":"echarts_line_y", "caption":"Liniendiagramm (vertikal)",
 "orientation":"V",
 "description":"Vertikales Liniendiagramm",
@@ -56,7 +48,6 @@
 {"viz_property_uniquename":"fontsize_y"},
 {"viz_property_uniquename":"fontcolor_y"},
 {"viz_property_uniquename":"singleColor"},
-{"viz_property_uniquename":"barStacked"},
 {"viz_property_uniquename":"seriesColorBy"}
 
 

superx/xml/js/viz/viz_viewer.js

@@ -2131,7 +2131,7 @@ function createBarLineSeriesObj(currentChartModel,chartType,orientation,measureC
         smooth: true,
         encode: encodeObj,
         datasetIndex:datasetIndex,
-        stack:"myStack",
+        stack:(getChartPropertyValue(currentChartModel.chartPropertiesUsed,"barStacked")=="false")?"":"myStack",
       	barWidth: '30%',
       	showBackground: true,
       	backgroundStyle: {
@@ -2152,7 +2152,6 @@ function createBarLineSeriesObj(currentChartModel,chartType,orientation,measureC
       	   distance:30,
        //offset:[30, 40],
  	   //   position:"bottom",
-      /*labelLayout:{}*/
       position:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"position_valueLabel"), //"bottom",
       offset: getOffsetValuelabelArray(getChartPropertyValue(currentChartModel.chartPropertiesUsed,"offset_x_valueLabel"),
       getChartPropertyValue(currentChartModel.chartPropertiesUsed,"offset_y_valueLabel")),
@@ -2195,7 +2194,7 @@ myDataset.source.forEach((row) => {
         smooth: true,
         seriesLayoutBy: 'row',
         emphasis: { focus: 'series' },
-        stack:"myStack",
+        stack:(getChartPropertyValue(currentChartModel.chartPropertiesUsed,"barStacked")=="false")?"":"myStack",
         name:row[0],
       	label: {
       	show: (getChartPropertyValue(currentChartModel.chartPropertiesUsed,"valueLabelShow")=="false")?false:true, //true
@@ -2204,12 +2203,14 @@ myDataset.source.forEach((row) => {
       	   distance:30,
        //offset:[30, 40],
  	   //   position:"bottom",
-      /*labelLayout:{}*/
       position:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"position_valueLabel"), //"bottom",
       offset: getOffsetValuelabelArray(getChartPropertyValue(currentChartModel.chartPropertiesUsed,"offset_x_valueLabel"),
       getChartPropertyValue(currentChartModel.chartPropertiesUsed,"offset_y_valueLabel")),
       	       
-    }
+    },
+    labelLayout(params) {
+    return getLabelLayout(chartType,params,orientation)
+	}
       };
       seriesArray.push(mySeriesObj);
       }
@@ -2335,15 +2336,19 @@ function getLabelLayout(seriesType,params,orientation)
         x: params.rect.x +params.rect.width+ 30,
         y: params.rect.y + params.rect.height / 2,
         verticalAlign: 'middle',
-        align: 'right'
+        align: 'right',      
+		hideOverlap: true
+		
     };
 	}
 	else
-	return {verticalAlign: 'middle'};
+	return {verticalAlign: 'middle',      
+		hideOverlap: true};
 	}
 	else
 	{//line:
-	return {verticalAlign: 'bottom'};
+	return {verticalAlign: 'bottom',      
+		hideOverlap: true};
 	}