Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

esteso highcharts anche per general;

Browse Source 
lock in categorySummary per le categorie hidden;
aggiunta del sondaggio in articolo;
inizio funzione di commento
This commit is contained in:
Lorenzo Giacomelli
2016-03-17 10:18:24 +01:00
parent bdca9f176e
commit 3f641fd7b5
6 changed files with 166 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/lib/gui/GUIHandler.php
+1 -1
View File
@@ -159,7 +159,7 @@ class GUIHandler {
<div class="headContainer">
<div class="upperBar">
<div class="dateBar"><?php echo $day." ".$mesi[date("n")]." ".date("Y"); ?> - Aggiornato alle <span style="color:#f68235;"><?php echo date("H:i");?></span></div>
<div class="loginReg"><?php echo UserLoginManager::isLogged()?UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome:'<a href="javascript:openLoginModal();">LOGIN</a>';?> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a></div>
<div class="loginReg"><?php echo UserLoginManager::isLogged()?UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome:'<a id="loginLink" href="javascript:openLoginModal();">LOGIN</a>';?> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a></div>
<div class="socialBar">
<a class="socialLink" href="https://www.facebook.com/ifattidinapoli" target="_blank"><div style="background-image:url(images/fb.png);"></div></a>
<a class="socialLink" href="https://twitter.com/fattidinapoli" target="_blank"><div style="background-image:url(images/twitter.png);"></div></a>
private/lib/gui/html.inclusion.php
+1 -1
View File
@@ -37,7 +37,7 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"ckeditor/ckeditor.js"
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"datetimepicker-master/build/jquery.datetimepicker.full.min.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"functions.js?rev=".time());
public/articolo.php
+143 -35
View File
@@ -7,8 +7,10 @@ Creation Date: 05/feb/2016
require_once(dirname(__FILE__)."/load.php");
try {
// UserLoginManager::logout();
$sendComment = false;
$articolo = null;
if (array_key_exists("id", $_GET)){
$articolo = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("id"=>$_GET["id"],"status"=>NotiziaModel::STATUS_ACCEPTED));
}
@@ -18,10 +20,15 @@ try {
AnalyticsHelper::logNotiziaImpression($articolo->id);
AnalyticsHelper::logPageImpression();
$user = UserLoginManager::getLogged();
$media = DaoMediaHandler::getMainMediaFromModel($articolo);
$medias = DaoMediaHandler::getMedias($articolo);
$commenti = GlobalVariables::get("dao")->query("CommentiModel",
array("notizia"=>$articolo->id,"status"=>CommentoModel::STATUS_ACCEPTED),
array("sort"=>array("about.data"=>-1))
);
// echo $articolo->titolo;
// var_dump($medias);
$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
@@ -53,6 +60,38 @@ try {
$additionalHeaders[] = '<meta property="og:image" content="'.$media->getRenderer()->getImageLink(MediaRenderer::SIZE_SMALL).'"/>';
}
if(array_key_exists("submit", $_POST) && strcmp($_POST["submit"] ,"Submit")==0){
// var_dump($articolo->sondaggio->voci);
if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){
if(!in_array($user->username, $articolo->sondaggio->votanti)){
$selectedVoice = $_POST["voce"];
foreach ($articolo->sondaggio->voci as $voce){
// var_dump($voce);
if(strcmp($voce->nome, $selectedVoice)==0){
$voce->voti +=1;
}
// var_dump($voce);
}
$articolo->sondaggio->votanti[] = $user->username;
GlobalVariables::get("dao")->save($articolo);
}
}
// var_dump($articolo->sondaggio);
}
if(array_key_exists("sendCommento", $_POST) && strcmp($_POST["sendCommento"] ,"Send")==0){
$saveable = new stdClass();
$saveable->user = UserLoginManager::getLogged();
$saveable->notizia = $articolo->id;
$saveable->titolo = $_POST["titolo"];
$saveable->testo = $_POST["commento"];
$saveable->status = CommentoModel::STATUS_PENDING;
$commento = new CommentoModel($savable);
GlobalVariables::get("dao")->save($commento);
}
}catch(GUIException $ex){
$error = $ex->getMessage();
}catch (Exception $exec){
@@ -79,7 +118,7 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
<div class="headArticolo">
<div class="articoloMainMedia mediaContent" <?php echo $mediaMetaInfo;?>>
<?php if(!is_null($media)) {
$media->renderMedia(array("size"=>MediaRenderer::SIZE_MEDIUM));
$media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG));
}
?>
</div>
@@ -91,6 +130,33 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
</div>
</div>
</div>
<?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?>
<div class="sondaggioContainer">
<div id="sondaggioGraph" style="height:300px;margin-right:280px;margin-top:10px;"></div>
<div class="votanti">Votanti: <?php $i=0; foreach ($articolo->sondaggio->votanti as $votante){ echo ($i++==0?"":", ").$votante;}?></div>
<?php if(UserLoginManager::isLogged()){
if(!in_array($user->username, $articolo->sondaggio->votanti)){?>
<div class="sondaggioOptions">
<form method="POST">
<?php foreach ($articolo->sondaggio->voci as $voce){?>
<input type="radio" name="voce" value="<?php echo $voce->nome;?>"><?php echo $voce->nome;?>
<?php } ?>
<input type="submit" name="submit" value="Submit" />
</form>
</div>
<?php }
else{
?>
<div class="noLogin">Hai già votato per questo sondaggio</div>
<?php }
}
else{
?>
<div class="noLogin">Effettua il <a href="#loginLink">login</a> per votare o se non hai ancora un account <a href="#regButton">registrati</a></div>
<?php }
?>
</div>
<?php }?>
<div class="articoloLeftBar">
<div class="utilityBar">
<div class="socialBarArticolo">
@@ -122,20 +188,39 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
<?php }?>
<div class="commentiContainer">
<div id="sentMessage"></div>
<?php //if(UserLoginManager::isLogged()){?>
<?php if(UserLoginManager::isLogged()){?>
<div id="commentoArea" class="newCommento">
<form method="POST" id="commentoForm">
<div>Titolo commento:<textarea name="titolo" rows="2" cols="10"></textarea></div>
<div>Commento:<textarea name="commento"rows="10" cols="10"></textarea></div>
<div>Titolo commento:</div>
<textarea name="titolo" rows="2" cols="30"></textarea>
<div>Commento:</div>
<textarea name="commento"rows="5" cols="80"></textarea>
<input type="hidden" name="id" value="<?php echo $articolo->id;?>" />
<input type="submit" name="sendCommento" value="Send" />
</form>
<div class="formBtns">
<a href="javascript:void(0);" id="submit" >Invia</a>
</div>
</div>
<?php //}?>
<div>TUTTI I COMMENTI</div>
<?php }
else{
?>
<div class="noLogin">Effettua il <a href="#loginLink">login</a> per commentare o se non hai ancora un account <a href="#regButton">registrati</a></div>
<?php }
if(sizeof($commenti)>0){
?>
<div class="oldCommentiContainer">
<?php foreach ($commenti as $oldCommento){
?>
<div class="commento">
<div>Username</div>
<span>Titolo</span>
<span>Testo</span>
</div>
<?php }
?>
</div>
<?php
}
?>
</div>
</div>
<div class="articoloRightBar" style="width:280px;display:inline-block;">
@@ -149,30 +234,32 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
<script type="text/javascript">
$(document).ready(function(event){
var size = $("#carosel").children().length;
var childrenWidth = $(".carosImage").outerWidth();
$("#carosel").width((size+1 )* childrenWidth);
var minLeft = (size - 4)*childrenWidth;
var actualLeft = $("#carosel").position().left;
$(".left").click(function(){
if(actualLeft > -minLeft){
$("#carosel").animate({left:"-=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
$(".right").click(function(){
if(actualLeft < minLeft){
$("#carosel").animate({left:"+=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
<?php if(sizeof($medias)>1){?>
var size = $("#carosel").children().length;
var childrenWidth = $(".carosImage").outerWidth();
$("#carosel").width((size+1 )* childrenWidth);
var minLeft = (size - 4)*childrenWidth;
var actualLeft = $("#carosel").position().left;
$(".left").click(function(){
if(actualLeft > -minLeft){
$("#carosel").animate({left:"-=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
$(".right").click(function(){
if(actualLeft < minLeft){
$("#carosel").animate({left:"+=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
<?php } ?>
$("#submit").click(function (){
// $("form#commentoForm").submit(function (){
$.ajax({
@@ -188,7 +275,28 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
// });
});
<?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?>
$("#sondaggioGraph").highcharts({
chart:{type:'bar'},
title:{text:'<?php echo trim(html_entity_decode($articolo->sondaggio->titolo)); ?>'},
xAxis:{
categories:[<?php $i =0; foreach($articolo->sondaggio->voci as $voce){
echo ($i++==0?"":", ")."\"".trim($voce->nome)."\"";
}
?>]
},
yAxis:{
title:{text:"Numero Voti"}
},
series:[{
name:"Voti",
data:[<?php $i =0; foreach($articolo->sondaggio->voci as $voce){
echo ($i++==0?"":", ").$voce->voti;
}
?>]
}]
});
<?php }?>
// $("form#commentoForm").on('submit',function (){
// $.ajax({
// type:'post',
public/categorySummary.php
+6 -1
View File
@@ -3,13 +3,18 @@
require_once(dirname(__FILE__)."/load.php");
try{
AnalyticsHelper::logPageImpression();
GUIHandler::generateHtmlHeaders();
$category = "";
if(array_key_exists("category", $_GET) && strcmp($_GET["category"], "")!=0){
var_dump(NotiziaModel::$NOTIZIE_CATEGORY[intval($_GET["category"])]["hidden"]);
if(NotiziaModel::$NOTIZIE_CATEGORY[$_GET["category"]]["hidden"]){
GUIHandler::redirect("index.php");
}
$category = $_GET["category"];
// $category = NotiziaModel::CATEGORY_CRONACA;
public/searchResults.php
+12 -13
View File
@@ -8,8 +8,10 @@ try {
AnalyticsHelper::logPageImpression();
GUIHandler::generateHtmlHeaders();
$searchParameters = "";
if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){
var_dump($_POST["search"]);
$searchParameters = strip_tags(PostHandler::get("search"));
// $notizie = GlobalVariables::get("dao")->query("NotiziaModel",
@@ -19,13 +21,14 @@ try {
$found = false;
$limit=12;
$page = 1;
$numPages = 1;
if(array_key_exists("page", $_POST)){
$page = intval($_POST["page"]);
}
$skip =($page - 1) * $limit;
$notizieAll = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters,
$notizieAll = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED)
);
@@ -37,14 +40,9 @@ try {
$found = false;
}
// $notizie = GlobalVariables::get("dao")->query("NotiziaModel",
// array("status"=>NotiziaModel::STATUS_ACCEPTED),
// array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
// );
$notizie = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters,
$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED),
array("skip"=>$skip,"limit"=>$limit)
array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
);
if (sizeof($notizie)>0){
@@ -65,7 +63,7 @@ try {
$msg = LogModel::fromException($exec);
GlobalVariables::get("dao")->save($msg);
GUIHandler::redirect("index.php");
// GUIHandler::redirect("index.php");
}
?>
@@ -116,12 +114,13 @@ try {
<form method="POST">
<input type="hidden" value="<?php echo $searchParameters;?>">
<?php
for($i = 1;$i<=$numPages;$i++){
// for($i = 1;$i<=$numPages;$i++){
?>
<!-- <div id ="page_<?php // echo $i;?>" class="page" style="padding:10px;cursor:pointer;"><?php //echo $i;?></div> -->
<?php
}
// }
?>
<!-- <input type="hidden" name="page" value="javascript:$('#page<?php //echo $i;?>').click(function(){$('.page').val('$(#page_<?php // echo $i;?>)')})"> -->
</form>
</div>
public/style/public.css
+3 -3
View File
@@ -338,10 +338,10 @@ body{font-family:lato, arial;}
.summaryRightBar{width:370px;padding:5px;vertical-align:top;display:inline-block;}
.rightBarContainer{width:100%;height:100%;}
.noLogin{padding:10px;border:solid #C0C0C0 2px;margin:5px;border-radius:10px;}
.noLogin a {color:#68A2C1;}
.newCommento textarea{resize:none;}
.bannerContainer{width:45%;padding:5px;display:inline-block;}