From c7b75b6b47e31e1bf32f27d25585d6a3a21c125c Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 13:34:25 +0200
Subject: [PATCH 1/8] Inserito nuovo sistema di statistiche custom

---
 private/lib/PipelineHelper.php    |  62 +++++++++++++++
 private/lib/gui/MenuGenerator.php |  10 +--
 public/admin/statCustom.php       | 127 ++++++++++++++++++++++++++++++
 3 files changed, 194 insertions(+), 5 deletions(-)
 create mode 100644 public/admin/statCustom.php

diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php
index 2e953b3..598d685 100644
--- a/private/lib/PipelineHelper.php
+++ b/private/lib/PipelineHelper.php
@@ -67,6 +67,68 @@ class PipelineHelper {
 		return $rval;
 	}
 	
+	public static function getDailyVisualizationPipelineByStartAndEnd($startDate,$endDate){
+		$rval = array(
+				array(
+						'$match'=>array(
+								'statType'=>StatisticModel::STAT_TYPE_PAGE,
+								'date'=>array(
+										'$gte'=>new MongoDate($startDate),
+										'$lte'=>new MongoDate($endDate)
+								)
+						)
+				),
+				array(
+						'$group'=>array(
+								"_id"=>array(
+										'date'=>array(
+												"day"=>array('$dayOfMonth'=>'$date'),
+												"month"=>array('$month'=>'$date'),
+												"year"=>array('$year'=>'$date')
+										),
+										'user'=>'$user.id',
+								),
+								"visualizzazioni"=>array(
+										'$sum'=>1
+								),
+								"isNew"=>array(
+										'$sum'=>array(
+												'$cond'=>array(
+														array('$eq'=>array('$user.isNew',true)),
+														1,
+														0
+												)
+										)
+								)
+						)
+				),
+				array(
+						'$group'=>array(
+								"_id"=>array(
+										'date'=>'$_id.date'
+								),
+								"visualizzazioni"=>array(
+										'$sum'=>'$visualizzazioni'
+								),
+								"unici"=>array(
+										'$sum'=>'$isNew'
+								),
+								"visitatori"=>array(
+										'$sum'=>1
+								)
+						)
+				),
+				array(
+						'$sort'=>array(
+								"_id.date.year"=>1,
+								"_id.date.month"=>1,
+								"_id.date.day"=>1
+						)
+				)
+		);
+		return $rval;
+	}
+	
 	public static function getMonthlyVisualizationPipeline($startDate){
 		$rval = array(
 				array(
diff --git a/private/lib/gui/MenuGenerator.php b/private/lib/gui/MenuGenerator.php
index f6ae20f..fa6e426 100644
--- a/private/lib/gui/MenuGenerator.php
+++ b/private/lib/gui/MenuGenerator.php
@@ -34,11 +34,11 @@ class MenuGenerator {
 			array("label"=>"Nuova Mail","page"=>"editMail.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN),
 			array("label"=>"Coda Mail","page"=>"listMail.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN)
 		)),
-		array("label"=>"Statistiche","page"=>"statSito.php","requires"=>AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR),
-// 		array("label"=>"Statistiche", "subvoices"=>array(
-// 			array("label"=>"Sito","page"=>"statSito.php","requires"=>AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR),
-// 			array("label"=>"Banner","page"=>"statBanner.php","requires"=>AdminModel::ADMIN_TYPE_BANNER_SUPERVISOR)
-// 		)),
+// 		array("label"=>"Statistiche","page"=>"statSito.php","requires"=>AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR),
+		array("label"=>"Statistiche", "subvoices"=>array(
+			array("label"=>"Automatiche","page"=>"statSito.php","requires"=>AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR),
+			array("label"=>"Per data","page"=>"statCustom.php","requires"=>AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR)
+		)),
 		
 		array("label"=>"Superuser", "subvoices"=>array(
 			array("label"=>"Nuovo Amministratore","page"=>"editAmministratori.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN),
diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
new file mode 100644
index 0000000..7048485
--- /dev/null
+++ b/public/admin/statCustom.php
@@ -0,0 +1,127 @@
+<?php
+/*
+Author: 		Riccardo Di Dato
+Creation Date:	18/apr/2016
+*/
+
+require_once(dirname(__FILE__)."/../load.php");
+
+GUIHandler::generateHtmlHeaders(array(),true);
+
+if (!AdminLoginManager::isLogged()){
+	GUIHandler::redirect("admin/login.php");
+}
+else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_STATISTICHE_SUPERVISOR)){
+	GUIHandler::redirect("admin/index.php");
+}
+
+MenuGenerator::generateMenu();
+
+HTMLHelper::generateAdminHead();
+
+$showGraph = false;
+$start = strtotime("-1 month");
+$end = time();
+$action = PostHandler::get("action");
+if (!is_null($action) && strcmp($action, "show")==0){
+	$showGraph = true;
+	$start = strtotime(PostHandler::get("start"));
+	$end = strtotime(PostHandler::get("end"));
+}
+?>
+<div>
+	<form id="customStatForm" method="POST" action="">
+		<input type="hidden" name="action" value="" />
+		<div style="display:inline; width:50%;">
+			<div style="display:inline-block;"><span class="label">Inizio:</span><input type="text" class="datepicker" name="start" value="<?php echo date("d-m-Y",$start);?>"></div>
+		</div><div style="display:inline; width:50%;">
+			<div style="display:inline-block;"><span class="label">Fine:</span><input type="text" class="datepicker" name="end" value="<?php echo date("d-m-Y",$end);?>"></div>
+		</div>
+	</form>
+	<div class="formBtns" style="text-align:center;">
+		<a href="#" id="customStatForm_show" >Mostra</a>
+	</div>
+	<div id="statContainer"></div>
+	<?php 
+	if ($showGraph){
+		$result = GlobalVariables::get("dao")->aggregate("StatisticModel",PipelineHelper::getDailyVisualizationPipelineByStartAndEnd($start,$end));
+		for ($i=0; $i<sizeof($result); $i++){
+			$ele = $result[$i];
+			$result[$i]["mktime"] = mktime(1,0,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
+		}
+		
+		?>
+			<script type="text/javascript">
+				$(function () {
+					$('#statContainer').highcharts({
+						title: {
+				            text: 'Statistiche'
+				        },
+				
+				        tooltip:{
+				            xDateFormat:"%d/%m/%Y",
+							crosshairs:[true],
+							shared: true
+				        },
+				
+				        xAxis:{
+							type:'datetime',
+							tickInterval: 24*3600*1000,
+							labels:{
+								formatter: function() {
+									return Highcharts.dateFormat("%d/%m/%Y", this.value, false);
+								}
+					        }
+				        },
+				
+				        yAxis:{
+							title:{
+								text:"Visite"
+							}
+				        },
+				
+				        series: [{
+				        	name: 'Visualizzazioni',
+				            data: [<?php 
+				            	$i = 0;
+				            	foreach ($result as $ele){
+									echo ($i++==0?"":", ")."[".($ele["mktime"]).",".$ele["visualizzazioni"]."]";
+								}
+				            ?>]
+				        }, {
+				            name: 'Visitatori',
+				            data: [<?php 
+								$i = 0;
+					        	foreach ($result as $ele){
+									echo ($i++==0?"":", ")."[".($ele["mktime"]).",".$ele["visitatori"]."]";
+								}
+					        ?>]
+				        }, {
+				            name: 'Unici',
+				            data: [<?php 
+								$i = 0;
+					        	foreach ($result as $ele){
+									echo ($i++==0?"":", ")."[".($ele["mktime"]).",".$ele["unici"]."]";
+								}
+					        ?>]
+				        }]
+				        
+					});
+				});
+			</script>
+		<?php 
+	}
+	
+	
+	?>
+</div>
+<script type="text/javascript">
+	$(document).ready(function(event){
+		$("#customStatForm_show").click(function(event){
+			$("form#customStatForm input[type=hidden][name=action]").val("show");
+			$("form#customStatForm").submit();
+		});
+		
+		$(".datepicker").datepicker({dateFormat:"dd-mm-yy"});	
+	});
+</script>
\ No newline at end of file

From 8d344c63d2251f55fef299ac2e8de075b486cfc5 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 15:12:34 +0200
Subject: [PATCH 2/8] modificate date in statCustom

---
 public/admin/statCustom.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
index 7048485..78ae629 100644
--- a/public/admin/statCustom.php
+++ b/public/admin/statCustom.php
@@ -25,8 +25,8 @@ $end = time();
 $action = PostHandler::get("action");
 if (!is_null($action) && strcmp($action, "show")==0){
 	$showGraph = true;
-	$start = strtotime(PostHandler::get("start"));
-	$end = strtotime(PostHandler::get("end"));
+	$start = strtotime(PostHandler::get("start")." 00:01");
+	$end = strtotime(PostHandler::get("end")." 23:59");
 }
 ?>
 <div>
@@ -44,6 +44,7 @@ if (!is_null($action) && strcmp($action, "show")==0){
 	<div id="statContainer"></div>
 	<?php 
 	if ($showGraph){
+
 		$result = GlobalVariables::get("dao")->aggregate("StatisticModel",PipelineHelper::getDailyVisualizationPipelineByStartAndEnd($start,$end));
 		for ($i=0; $i<sizeof($result); $i++){
 			$ele = $result[$i];

From f884a9b5b9405a985cdb7b91f0b19ce404df9ed7 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 15:32:57 +0200
Subject: [PATCH 3/8] Fix statistiche Highcharts

---
 public/admin/statCustom.php | 3 ++-
 public/admin/statSito.php   | 2 +-
 public/js/init.js           | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
index 78ae629..a5a2cc1 100644
--- a/public/admin/statCustom.php
+++ b/public/admin/statCustom.php
@@ -48,8 +48,9 @@ if (!is_null($action) && strcmp($action, "show")==0){
 		$result = GlobalVariables::get("dao")->aggregate("StatisticModel",PipelineHelper::getDailyVisualizationPipelineByStartAndEnd($start,$end));
 		for ($i=0; $i<sizeof($result); $i++){
 			$ele = $result[$i];
-			$result[$i]["mktime"] = mktime(1,0,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
+			$result[$i]["mktime"] = mktime(0,1,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
 		}
+		var_dump($result);
 		
 		?>
 			<script type="text/javascript">
diff --git a/public/admin/statSito.php b/public/admin/statSito.php
index 2a38422..c9ce2f1 100644
--- a/public/admin/statSito.php
+++ b/public/admin/statSito.php
@@ -26,7 +26,7 @@ HTMLHelper::generateAdminHead();
 $result = GlobalVariables::get("dao")->aggregate("StatisticModel",PipelineHelper::getDailyVisualizationPipeline(strtotime("-1 month")));
 for ($i=0; $i<sizeof($result); $i++){
 	$ele = $result[$i];
-	$result[$i]["mktime"] = mktime(1,0,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
+	$result[$i]["mktime"] = mktime(0,1,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
 }
 ?>
 <div>
diff --git a/public/js/init.js b/public/js/init.js
index e69de29..9c19180 100644
--- a/public/js/init.js
+++ b/public/js/init.js
@@ -0,0 +1,5 @@
+Highcharts.setOptions({
+    global : {
+        useUTC : false
+    }
+});
\ No newline at end of file

From 34f90cc5f6fb2aaec48e03e6ac7e69f38f0ffa0c Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 15:35:10 +0200
Subject: [PATCH 4/8] rimosso var dump

---
 public/admin/statCustom.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
index a5a2cc1..0dde811 100644
--- a/public/admin/statCustom.php
+++ b/public/admin/statCustom.php
@@ -50,7 +50,6 @@ if (!is_null($action) && strcmp($action, "show")==0){
 			$ele = $result[$i];
 			$result[$i]["mktime"] = mktime(0,1,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
 		}
-		var_dump($result);
 		
 		?>
 			<script type="text/javascript">

From 51f264091610b0f2a9c10e1f656c757346af2b60 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 15:58:36 +0200
Subject: [PATCH 5/8] fix timezone statistiche

---
 public/admin/statCustom.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
index 0dde811..66ce1f8 100644
--- a/public/admin/statCustom.php
+++ b/public/admin/statCustom.php
@@ -25,8 +25,17 @@ $end = time();
 $action = PostHandler::get("action");
 if (!is_null($action) && strcmp($action, "show")==0){
 	$showGraph = true;
-	$start = strtotime(PostHandler::get("start")." 00:01");
-	$end = strtotime(PostHandler::get("end")." 23:59");
+
+
+	$date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("Europe/Rome"));
+	$start = $date->format('U');
+	
+	$date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("Europe/Rome"));
+	$end = $date->format('U');
+	
+	
+// 	$start = strtotime(PostHandler::get("start")." 00:00");
+// 	$end = strtotime(PostHandler::get("end")." 23:59");
 }
 ?>
 <div>

From 4e131455781a74af06e8c2a7587b1cb27991f483 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 16:01:50 +0200
Subject: [PATCH 6/8] inserito un var dump per check in produzione

---
 public/admin/statCustom.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php
index 66ce1f8..640cb42 100644
--- a/public/admin/statCustom.php
+++ b/public/admin/statCustom.php
@@ -60,6 +60,8 @@ if (!is_null($action) && strcmp($action, "show")==0){
 			$result[$i]["mktime"] = mktime(0,1,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000;
 		}
 		
+		var_dump($result);
+		
 		?>
 			<script type="text/javascript">
 				$(function () {

From 8c8ea0479d2baf75209a316864b53f8db1c50c80 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 16:08:54 +0200
Subject: [PATCH 7/8] eliminato fix UTC

---
 public/js/init.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/init.js b/public/js/init.js
index 9c19180..dbd901d 100644
--- a/public/js/init.js
+++ b/public/js/init.js
@@ -1,5 +1,5 @@
-Highcharts.setOptions({
-    global : {
-        useUTC : false
-    }
-});
\ No newline at end of file
+//Highcharts.setOptions({
+//    global : {
+//        useUTC : false
+//    }
+//});
\ No newline at end of file

From 5831307041758d5b487861efcb3f80e7215434c0 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Mon, 18 Apr 2016 16:10:50 +0200
Subject: [PATCH 8/8] reinserito UTC

---
 public/js/init.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/init.js b/public/js/init.js
index dbd901d..9c19180 100644
--- a/public/js/init.js
+++ b/public/js/init.js
@@ -1,5 +1,5 @@
-//Highcharts.setOptions({
-//    global : {
-//        useUTC : false
-//    }
-//});
\ No newline at end of file
+Highcharts.setOptions({
+    global : {
+        useUTC : false
+    }
+});
\ No newline at end of file