From: Claudio Sacerdoti Coen <claudio@zenone.casamia.org>
Date: Tue, 16 Dec 2014 16:07:13 +0000 (+0100)
Subject: Timestamp on exercises.
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=52e35554a3688505061e19fc8dc1ce97f0152dd8;p=logicplayer.git

Timestamp on exercises.
---

diff --git a/public_html/esForUsr.php b/public_html/esForUsr.php
index 9c5ab12..4f6dffc 100755
--- a/public_html/esForUsr.php
+++ b/public_html/esForUsr.php
@@ -14,7 +14,7 @@
 	if($result->name=='all')
 		$str="SELECT * FROM ".$DATA['tbEsercizi'].";";
 	else
-		$str="SELECT * FROM ".$DATA['tbEsercizi']." WHERE ".$DATA['clUser']."='".$result->name."' ORDER BY esercizio;";
+		$str="SELECT * FROM ".$DATA['tbEsercizi']." WHERE ".$DATA['clUser']."='".$result->name."' ORDER BY ".$DATA['clEsercizio'].", ".$DATA['clTime'].";";
 	$str=mysqli_query($con,$str);
 	if (!$str)
 	{
@@ -32,7 +32,7 @@
 		if($esercizio['esercizio']==$risp[$DATA['clEsercizio']])
 		{
 			//aggiungo utenti e click ell'es corrente
-			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']]);
+			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']],'time'=>$risp[$DATA['clTime']]);
 		}
 		else
 		{
@@ -42,7 +42,7 @@
 			unset($esercizio);
 			unset($risultati);
 			$esercizio['esercizio']=$risp[$DATA['clEsercizio']];
-			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']]);
+			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']],'time'=>$risp[$DATA['clTime']]);
 		}
 	}while($risp=mysqli_fetch_array($str));      
 	$esercizio['risultati']=$risultati;
diff --git a/public_html/logout.js b/public_html/logout.js
deleted file mode 100755
index 9817f6a..0000000
--- a/public_html/logout.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function change()
-{
-	document.location.href="index.html";
-}
-function logout()
-{
-        $.ajax({
-					type: 'POST',
-					url: 'logout.php',
-					async: false
-                }).success
-                        (
-							function(response)
-							{
-								change();
-							}
-                        );
-}
diff --git a/public_html/logout.php b/public_html/logout.php
deleted file mode 100755
index 7060d00..0000000
--- a/public_html/logout.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-	session_start();
-	unset($_SESSION['ID']);
-	$arr=array('result'=>"logout effettuato con successo");
-	$ris=json_encode($arr);
-	echo $ris;
-?>
diff --git a/public_html/main.php b/public_html/main.php
index d88e8ca..952bb70 100755
--- a/public_html/main.php
+++ b/public_html/main.php
@@ -35,6 +35,7 @@
 					<th>Nome Esercizio</th>
 					<th>Studente</th>
 					<th>voto</th>
+					<th>ora</th>
 				</tr>
 			</table>
 		</div>
@@ -50,6 +51,7 @@
 					<th>Studente</th>
 					<th>Nome Esercizio</th>
 					<th>voto</th>
+					<th>ora</th>
 				</tr>
 			</table>
 		</div>
diff --git a/public_html/prova.js b/public_html/prova.js
index 454156b..067eb72 100755
--- a/public_html/prova.js
+++ b/public_html/prova.js
@@ -21,7 +21,7 @@ function update(event)
 		success:function(val)
 		{
 			$("#tabella").empty();
-			$("#tabella").append("<tr><th>Nome Esercizio</th><th>Studente</th><th>voto</th>");
+			$("#tabella").append("<tr><th>Nome Esercizio</th><th>Studente</th><th>voto</th><th>ora</th>");
 			$.each(val.esercizi, function(i, item) {
 				var id="es"+i;
 				if(item.risultati[0].id!=null)
@@ -30,11 +30,14 @@ function update(event)
 					{
 						var id_i=id+j;
 						var tmpel='<input class="elimina" type="submit" risultato='+item.risultati[j].id+' value="elimina">';
+						var date= new Date(item.risultati[j].time*1000/1000);
+						var data_ora=date.getDate()+"/"+date.getMonth()+"/"+date.getFullYear()+"\t"+date.getHours()+":"+date.getMinutes();
 						$("#tabella").append($('<tr>').attr('id',id_i));
 						id_i="#"+id_i;
 						$(id_i).append($('<td>').text(item.esercizio));
 						$(id_i).append($('<td>').text(item.risultati[j].utente));
 						$(id_i).append($('<td>').text(item.risultati[j].click));
+						$(id_i).append($('<td>').text(data_ora));
 						$(id_i).append($('<td>').append(tmpel));
 					}
 				}
@@ -67,7 +70,7 @@ function updateUsr(event)
 		success:function(val)
 		{
 			$("#tab").empty();
-			$("#tab").append("<tr><th>Studente</th><th>Nome Esercizio</th><th>voto</th>");
+			$("#tab").append("<tr><th>Studente</th><th>Nome Esercizio</th><th>voto</th><th>ora</th>");
 			$.each(val.esercizi, function(i, item) {
 				var id="ut"+i;
 				if(item.risultati[0].id!=null)
@@ -76,11 +79,14 @@ function updateUsr(event)
 					{
 						var id_i=id+j;
 						var tmpel='<input class="elimina" type="submit" risultato='+item.risultati[j].id+' value="elimina">';
+						var date= new Date(item.risultati[j].time*1000/1000);
+						var data_ora=date.getDate()+"/"+date.getMonth()+"/"+date.getFullYear()+"\t"+date.getHours()+":"+date.getMinutes();
 						$("#tab").append($('<tr>').attr('id',id_i));
 						id_i="#"+id_i;
 						$(id_i).append($('<td>').text(item.risultati[j].utente));
 						$(id_i).append($('<td>').text(item.esercizio));
 						$(id_i).append($('<td>').text(item.risultati[j].click));
+						$(id_i).append($('<td>').text(data_ora));
 						$(id_i).append($('<td>').append(tmpel));
 					}
 				}
diff --git a/public_html/prova.pho b/public_html/prova.pho
deleted file mode 100755
index e69de29..0000000
diff --git a/public_html/prova.txt b/public_html/prova.txt
deleted file mode 100755
index 28c1837..0000000
--- a/public_html/prova.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mi sei riuscito a scaricare
-
diff --git a/public_html/serverRequest.php b/public_html/serverRequest.php
index 2303440..2f8e68a 100755
--- a/public_html/serverRequest.php
+++ b/public_html/serverRequest.php
@@ -14,7 +14,7 @@
 	if($result->name=='all')
 		$str="SELECT * FROM ".$DATA['tbEsercizi'].";";
 	else
-		$str="SELECT * FROM ".$DATA['tbEsercizi']." WHERE ".$DATA['clEsercizio']."='".$result->name."' ORDER BY ".$DATA['clEsercizio'].";";
+		$str="SELECT * FROM ".$DATA['tbEsercizi']." WHERE ".$DATA['clEsercizio']."='".$result->name."' ORDER BY ".$DATA['clEsercizio'].", ".$DATA['clTime']." ;";
 	$str=mysqli_query($con,$str);
 	if (!$str)
 	{
@@ -32,7 +32,7 @@
 		if($esercizio['esercizio']==$risp[$DATA['clEsercizio']])
 		{
 			//aggiungo utenti e click ell'es corrente
-			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']]);
+			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']], 'time'=>$risp[$DATA['clTime']]);
 		}
 		else
 		{
@@ -42,7 +42,7 @@
 			unset($esercizio);
 			unset($risultati);
 			$esercizio['esercizio']=$risp[$DATA['clEsercizio']];
-			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']]);
+			$risultati[]=array('id'=>$risp[$DATA['clId']],'utente'=>$risp[$DATA['clUser']],'click'=>$risp[$DATA['clVoto']], 'time'=>$risp[$DATA['clTime']]);
 		}
 	}while($risp=mysqli_fetch_array($str));      
 	$esercizio['risultati']=$risultati;