From 62f223931b9f69b109744a9647799cc7a9265e7d Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Sat, 12 Mar 2016 10:36:16 +0100 Subject: [PATCH 1/2] immagini e pagination di search --- oth/img/blueBalls.xcf | Bin 0 -> 1454 bytes public/images/blueBall.png | Bin 0 -> 217 bytes public/images/blueBalls.png | Bin 0 -> 268 bytes public/searchResults.php | 44 +++++++++++++++++++++++++++++++++--- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 oth/img/blueBalls.xcf create mode 100644 public/images/blueBall.png create mode 100644 public/images/blueBalls.png diff --git a/oth/img/blueBalls.xcf b/oth/img/blueBalls.xcf new file mode 100644 index 0000000000000000000000000000000000000000..8695ce65940aad656ad55329aebbefb2e6cddd00 GIT binary patch literal 1454 zcmbVLv2xQu5M9ZZ9Y=Nu0W$Fng@y*lGtMNfOKLj4z_BHvkzxhQFv$nd(@?A6pJ>&o z;19rw#CzwHV-quD*qOb3_q6-&ynFV8t83?G>^WW#xdM9y-zR`Qg&PKzBlvUpiHYTy zi;xzgXYjo@Uqt9I=GEa%__4-Jeu0{oh=)Fo90XS*-yQg~U;>I_hV+v8ZR9#h90ilp z{hsHK<0zgvJrxEs|8nGVm9(Of8wsQuaZc@lB-my4oRfAawTe=xy-HjiQ)m#!)ny z#~{@t7%e!uuc{kMEG6Qe##Cr&j3Ar{r$yrl#LTfZMv(Rz?yTV_z|=i~(>U=;t9k{z zk2dpz2Gy@YuK9VBGrw|gh}AWv*)60yKf!z@M$6GkV^wQD^+|BJ})F6a%o^^ z<>Y_bVU~q9P|+{z1t0!~blu`a>=gYTtEYbzS7ver$5JU);0F7W@E>uEE>VLW^5nd&k(; zbq89fL&X$|DHKyErclIiS}7EFicnN_P*gffF^6If#T<$`6fxFT4#k}!6jdD*l@1lF zCsALa&hl|!FKCg8Fc#T%=5ZAj*OYOVesT}z McUHH1xMy2_14U>Q1ONa4 literal 0 HcmV?d00001 diff --git a/public/images/blueBall.png b/public/images/blueBall.png new file mode 100644 index 0000000000000000000000000000000000000000..62c06b1def798d6e3b8da8eaa45f68438a01b74b GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv`A%-r0ThLU!AlYl~Lo-U3d5|?`~>=kTK;Awkke$z=R z)`M+9GP7GEvo+g=)+G~7bAlo&4g^2jcY1!pw8xQ+EG*ih3fo_3HAG~v`~CYVc31V< z%Vqh&(&m%CY!3DhP+J*m9wc%?_~4pv>i0Q+ip5U7*}i|Cl+1^R4=fe|ZDjCt^>bP0 Hl+XkKG{Hya literal 0 HcmV?d00001 diff --git a/public/images/blueBalls.png b/public/images/blueBalls.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b4b17b5c83cbc5b49f7783351d497e9af06301 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^N|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf17>a>2A#ssH%ov*Gd*1#Lo808owAYhuz`T<{B^zJ z9qt{|HdRlTJ8bRZ?OM93qH&4;XXaxO+q#9HG(J$CcSLcnh`{yVubD~?tXRqEQGCDd z#(~@XlkyHU=RUf#y>jcy-SQzXXV=b(f4a5ia-r-+(M_}SyRC00>!g_9{~_#ixB5uP ziM)M`FI#4C-8^evT7GBZqfhxOp3Z*4V{(AO#+1$W@SeEH!~dBkZ;exb`5|-_(2)$D Lu6{1-oD!Mid); +// AnalyticsHelper::logNotiziaImpression($articolo->id); AnalyticsHelper::logPageImpression(); GUIHandler::generateHtmlHeaders(); - $found = false; if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){ $searchParameters = strip_tags(PostHandler::get("search")); +// $notizie = GlobalVariables::get("dao")->query("NotiziaModel", +// array("status"=>NotiziaModel::STATUS_ACCEPTED), +// array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) +// ); + $found = false; + $limit=12; + $page = 1; + + if(array_key_exists("page", $_POST)){ + $page = intval($_POST["page"]); + } + + $skip =($page - 1) * $limit; + $notizieAll = GlobalVariables::get("dao")->query("NotiziaModel", + array("status"=>NotiziaModel::STATUS_ACCEPTED), + array("sort"=>array("about.data"=>-1)) + ); + + if(sizeof($notizieAll)>0){ + $dim = count($notizieAll); + $numPages = ceil($dim/$limit); + } + else{ + $found = false; + } + $notizie = GlobalVariables::get("dao")->query("NotiziaModel", array("status"=>NotiziaModel::STATUS_ACCEPTED), - array("sort"=>array("about.data"=>-1),"limit"=>10) + array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit) ); if (sizeof($notizie)>0){ $found=true; $notizie = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $notizie); } + } else{ GUIHandler::redirect("index.php"); @@ -81,6 +107,18 @@ try {
+
+
+ + + + +
+
Date: Thu, 17 Mar 2016 10:18:24 +0100 Subject: [PATCH 2/2] esteso highcharts anche per general; lock in categorySummary per le categorie hidden; aggiunta del sondaggio in articolo; inizio funzione di commento --- private/lib/gui/GUIHandler.php | 2 +- private/lib/gui/html.inclusion.php | 2 +- public/articolo.php | 178 +++++++++++++++++++++++------ public/categorySummary.php | 7 +- public/searchResults.php | 25 ++-- public/style/public.css | 6 +- 6 files changed, 166 insertions(+), 54 deletions(-) diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php index d9afe98..88da976 100644 --- a/private/lib/gui/GUIHandler.php +++ b/private/lib/gui/GUIHandler.php @@ -159,7 +159,7 @@ class GUIHandler {
- Aggiornato alle
-
nome." ".UserLoginManager::getLogged()->cognome:'LOGIN';?> | REGISTRATI
+
nome." ".UserLoginManager::getLogged()->cognome:'LOGIN';?> | REGISTRATI
diff --git a/private/lib/gui/html.inclusion.php b/private/lib/gui/html.inclusion.php index 54e7959..d177ccd 100644 --- a/private/lib/gui/html.inclusion.php +++ b/private/lib/gui/html.inclusion.php @@ -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()); diff --git a/public/articolo.php b/public/articolo.php index df10b4a..3fd5794 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -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[] = ''; } + 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));
> renderMedia(array("size"=>MediaRenderer::SIZE_MEDIUM)); + $media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG)); } ?>
@@ -91,6 +130,33 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
+ hasProperty("sondaggio") && !is_null($articolo->sondaggio)){?> +
+
+
Votanti: sondaggio->votanti as $votante){ echo ($i++==0?"":", ").$votante;}?>
+ username, $articolo->sondaggio->votanti)){?> +
+
+ sondaggio->voci as $voce){?> + nome;?> + + +
+
+ +
Hai già votato per questo sondaggio
+ +
Effettua il login per votare o se non hai ancora un account registrati
+ +
+
@@ -122,20 +188,39 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
- +
-
Titolo commento:
- -
Commento:
+
Titolo commento:
+ +
Commento:
+ +
-
- Invia -
- -
TUTTI I COMMENTI
+ +
Effettua il login per commentare o se non hai ancora un account registrati
+ 0){ + ?> +
+ +
+
Username
+ Titolo + Testo +
+ +
+
@@ -149,30 +234,32 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));