diff --git a/public/articolo.php b/public/articolo.php index 0f4f465..9013284 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -138,17 +138,28 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); +
+
+
+ + + + +
+
+ hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?>
-
+
username, $articolo->sondaggio->votanti)){?> + if(in_array($user->username, $articolo->sondaggio->votanti)){?>
+ sondaggio->voci as $voce){?> - nome;?> +
nome;?>
- +
$additionalHeaders)); ?>
-
-
-
- - - - -
-
testo;?>
1){?>
@@ -270,7 +272,8 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); // }); }); -hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?> +hasProperty("sondaggio") && !is_null($articolo->sondaggio)){ + $colori=array('#7cb5ec', '#434348', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1');?> $("#sondaggioGraph").highcharts({ chart:{type:'bar'}, title:{text:'sondaggio->titolo)); ?>'}, @@ -283,10 +286,15 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); yAxis:{ title:{text:"Numero Voti"} }, + + legend: { + enabled: false, + }, series:[{ name:"Voti", data:[sondaggio->voci as $voce){ echo ($i++==0?"":", ").$voce->voti; +// echo ($i++==0?"{":", {").$voce->voti.",color:'".$colori[$i]."'}"; } ?>] }] diff --git a/public/style/public.css b/public/style/public.css index 88e28d3..6e6207a 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -393,6 +393,10 @@ display: inline-block; .newTitle{/* display:inline-block;vertical-align:top; */} .articoloRightBar{vertical-align:top;} +.sondaggioContainer{} +.sondaggioContainer #sondaggioGraph{height:300px;/* margin-right:280px */; margin-right:80px; margin-top:10px;} +.sondaggioOptions {background-color:#E0F6E5;border:solid black 1px;border-radius:10px;margin:10px 15px 0px;padding:5px;} +.sondaggioOptions .subInput{padding:5px;margin:10px;} .searchResultsContainer, .archivioResults, .categorySummaryContainer{width:600px;padding:5px 10px 5px 0px;vertical-align:top;display:inline-block;}