Renderer Variablen disabled/enabled #5

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

@@ -359,10 +359,10 @@ parent="Masken verwalten">Abfragen zur Administration von Visualisierungen </the
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_property_input_type"><file path="$VIZ_PFAD/schluesseltabellen/viz_property_input_type.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_property_group"><file path="$VIZ_PFAD/schluesseltabellen/viz_property_group.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_renderer"><file path="$VIZ_PFAD/schluesseltabellen/viz_renderer.unl"/></loadtable>
-
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
 <!--
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_type_type"><file path="$VIZ_PFAD/schluesseltabellen/viz_type_type.unl"/></loadtable>
-<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
+
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_type_fuellen.sql" database=""/>
 -->
 <!--<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_jobs_fuellen.sql" database=""/>-->
@@ -378,7 +378,7 @@ parent="Masken verwalten">Abfragen zur Administration von Visualisierungen </the
 <upgrade-step>
 <action error="stop">
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_type"><file path="$VIZ_PFAD/schluesseltabellen/viz_type.unl"/></loadtable>
-
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
 </action>
 <action error="stop">
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>

superx/xml/js/viz/viz_functions.js

@@ -571,7 +571,7 @@ function renderChartPropertyField(commonChartProperty)
 			selElem.id=commonChartProperty.name;
 			selElem.title=commonChartProperty.explanation;
 			//selElem.style="width:50px";
-			if(commonChartProperty.rendererUniquename=="")
+			if(commonChartProperty.variableName=="")
 			{
 				selElem.disabled="disabled";
 				selElem.readonly="readonly";
@@ -590,7 +590,7 @@ function renderChartPropertyField(commonChartProperty)
 			const textAreaElem = document.createElement("textarea");
 			textAreaElem.cols="20";
 			textAreaElem.rows=3;
-			if(commonChartProperty.rendererUniquename=="")
+			if(commonChartProperty.variableName=="")
 			{
 				textAreaElem.disabled="disabled";
 				textAreaElem.readonly="readonly";
@@ -608,17 +608,23 @@ function renderChartPropertyField(commonChartProperty)
 		break;
 		case "RANGE":
 		
-			//Einfaches Texteingabefeld:
+			//Schieberegler:
 			const rangeElem = document.createElement("input");
-			rangeElem.type="RANGE";
+			rangeElem.type="NUMBER";
-			rangeElem.min=commonChartProperty.range_from;
+			rangeElem.size=5;
-			rangeElem.max=commonChartProperty.range_to;
+			if(commonChartProperty.variableName=="")
-			rangeElem.step=50;
-			if(commonChartProperty.rendererUniquename=="")
 			{
 				rangeElem.disabled="disabled";
 				rangeElem.readonly="readonly";
 			}
+			
+			/* klappt noch nicht:
+			rangeElem.type="RANGE";
+			rangeElem.min=commonChartProperty.range_from;
+			rangeElem.max=commonChartProperty.range_to;
+			rangeElem.step=50;
+			*/
+
 			rangeElem.title=commonChartProperty.explanation;
 			rangeElem.name=commonChartProperty.name;
 			rangeElem.id=commonChartProperty.name;
@@ -634,7 +640,7 @@ function renderChartPropertyField(commonChartProperty)
 			const inpElem = document.createElement("input");
 			inpElem.type="TEXT";
 			inpElem.size=5;
-			if(commonChartProperty.rendererUniquename=="")
+			if(commonChartProperty.variableName=="")
 			{
 				inpElem.disabled="disabled";
 				inpElem.readonly="readonly";
@@ -1007,7 +1013,7 @@ function getChartOptions(categoryDim,measureDim,marksArray,chartOrientationVerti
 	var measureDim=document.getElementById("measure1").value;
 	var fontSizeDefault=getCommonChartProperty("fontSize")+"pt";
 	var myCaption=getCommonChartProperty("chartCaption");
-	var chartWidth=getCommonChartProperty("chartWidth");
+	var chartWidth=getCommonChartProperty("width");
 	var myFontFamily=getCommonChartProperty("font-family");
 	var myBgColor=getCommonChartProperty("background-color");
 	var myColor=getCommonChartProperty("color");
@@ -1019,10 +1025,10 @@ function getChartOptions(categoryDim,measureDim,marksArray,chartOrientationVerti
 	
 	for(var k=0;k < commonChartProperties.length;k++)
 	{
-		if(commonChartProperties[k].name!="" && (commonChartProperties[k].groupUniquename=="STYLE" 
+		if(commonChartProperties[k].variableName!="" && (commonChartProperties[k].groupUniquename=="STYLE" 
 			|| commonChartProperties[k].groupUniquename=="LAYOUT"))
 		{
-			stylesString+=",\""+commonChartProperties[k].name+"\":\""+getCommonChartProperty(commonChartProperties[k].name)+"\"";
+			stylesString+=",\""+commonChartProperties[k].variableName+"\":\""+getCommonChartProperty(commonChartProperties[k].name)+"\"";
 		}
 			
 	}
@@ -1090,22 +1096,38 @@ function makeBarX(chartDivElem,selectionRs) {
 	var marksArray=new Array();
 	if(fillDim=="")
 	marksArray[0]=Plot.barX(selectionRs,
+	Plot.sort("rownr", 
     			    	{
     		          x: measureDim, 
     		          y: categoryDim,
+			  
 			  fill: "blue"
-    		        });
+    		        })
+			);
 		else
 	marksArray[0]=Plot.barX(selectionRs,
-    			    	{
+    		   	{
     		          x: measureDim, 
     		          y: categoryDim,
+			  //sort: {y: "rownr"},
 			  fill: fillDim
-    		        });
+    		        })
+			;
 			
 	var options= getChartOptions(categoryDim,measureDim,marksArray,false);
-	
+/*	var svgPlot=Plot.plot({
-	document.getElementById(chartDivElem).appendChild(Plot.plot(options));
+  y: {
+    domain: d3.sort(selectionRs, d => -d.rownr).map(d => d.dimension1Value)
+  },
+  x: {
+    grid: true
+  },
+  marks: [
+    Plot.barX(selectionRs, {x: measureDim, y: categoryDim})
+  ]
+});*/
+var svgPlot=Plot.plot(options);
+	document.getElementById(chartDivElem).appendChild(svgPlot);
 	}
 function makeBarY(chartDivElem,selectionRs) {
 	var categoryDim=document.getElementById("viz_dimension1").value;
@@ -1145,11 +1167,12 @@ function makeLine(chartDivElem,selectionRs) {
     		          x: categoryDim,
     		          curve: "linear"
     		        });
-	marksArray[1]=Plot.dot(rs,
+	marksArray[1]=Plot.dot(selectionRs,
 	    	{
           y: measureDim, 
           x: categoryDim
         });
+	marksArray[2]=Plot.ruleY([0]);
 
 	var options= getChartOptions(categoryDim,measureDim,marksArray,true);
 	

superx/xml/viz_html_chart.xsl

@@ -1715,84 +1715,6 @@ rs.push(new dataRow(</xsl:text><xsl:value-of select="$rownr"/>
      </div>
 <div id="chartPropertiesForm"> <!--style="visibility:hidden" class="section"--></div>
 
-<!--Ende Formular Allg. Layoutmerkmale-->
-
-     <!--<div class="field is-grouped"> 
-	  <div class="label-container">
-	     <label class="label is-required is-small">Kategorie-Dimension</label>
-	  </div>
-	   
-	  <div class="field is-active">
-	      <p class="control-new">
-	       <div class="select is-small is-fullwidth">
-		<select class="maskinputPflicht" id="measure1" name="measure1">
-		    <option class="maskinput" value="" selected="selected">Bitte wählen Sie</option>
-		</select>
-	       </div>
-	      </p>
-	  </div>
-	  
-	  <span class="separator">&#160;</span>
-	  <span class="separator">&#160;</span>
-	  
-	  <span class="info" onclick="window.open('https://super-ics.de/superx/doku/kern_modul/admin/f_Patcheinspielen.htm','_blank','directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660');">
-		   <figure class="image is-24x24">
-			<img src="../images/information_grey_liberation.svg" />
-		   </figure>
-	  </span>
-	  
-     </div>   
-	   	   
-     <div class="field is-grouped">
-	   <div class="label-container">
-	     <label class="label is-required is-small">Maß</label>
-	   </div>
-	   
-	   <div class="field is-active">
-	      <p class="control-new">
-	       <div class="select is-small is-fullwidth">
-		<select class="maskinputPflicht" id="measure1" name="measure1">
-		    <option class="maskinput" value="" selected="selected">Bitte wählen Sie</option>
-		</select>
-	       </div>
-	      </p>
-	   </div> 
-	   
-	   <span class="separator">&#160;</span>
-	   <span class="separator">&#160;</span>
-	  
-	   <span class="info" onclick="window.open('https://super-ics.de/superx/doku/kern_modul/admin/f_Patcheinspielen.htm','_blank','directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660');">
-		   <figure class="image is-24x24">
-			<img src="../images/information_grey_liberation.svg" />
-		   </figure>
-	   </span>
-     </div> -->
-	 
-     <!--<div class="field is-grouped">
-	   <div class="label-container">
-	     <label class="label is-required is-small">Serien-Dimension</label> 
-	   </div>
-	 
-	   <div class="field is-active">
-	      <p class="control-new">
-	       <div class="select is-small is-fullwidth">
-		<select class="maskinputPflicht" id="measure1" name="measure1" tabindex="220" 
-		    <option class="maskinput" value="" selected="selected">Bitte wählen Sie</option>
-		</select>
-	       </div>
-	      </p>
-	   </div>
-	   
-	   <span class="separator">&#160;</span>
-	   <span class="separator">&#160;</span>
-	   
-	   <span class="info" onclick="window.open('https://super-ics.de/superx/doku/kern_modul/admin/f_Patcheinspielen.htm','_blank','directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660');">
-		   <figure class="image is-24x24">
-			<img src="../images/information_grey_liberation.svg" />
-		   </figure>
-	   </span>
-     </div>-->
-
 <span class="separator">&#160;</span>
 <span class="separator">&#160;</span>