Commit 4053ed58 authored by KaikiNoKitsune's avatar KaikiNoKitsune
Browse files

second insert fatta, bug fix inserimento value come stringa

parent df828830

databaseFunctions.php

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ function insertData($insertParam) 
{

{

	$points[] = new Point(

	$points[] = new Point(

		$insertParam['resource'], // name of the measurement

		$insertParam['resource'], // name of the measurement

		$insertParam['value'], // the measurement value

		intval($insertParam['value']), // the measurement value

		['experiment' => $insertParam['experiment']], // optional tags

		['experiment' => $insertParam['experiment']], // optional tags

		[], // optional additional fields

		[], // optional additional fields

		strtotime($insertParam['date']) // Time precision has to be set to seconds!

		strtotime($insertParam['date']) // Time precision has to be set to seconds!
@@ -201,8 +201,8 @@ function getPointsByInterval($startTime, $endTime){ 
		->getResultSet()

		->getResultSet()

		->getPoints();

		->getPoints();





	$mergedArray = mergeResultArrays($cpuPoints, $hdPoints, 'experiment', array('cpu'), array('disk'), 0);

	$mergedArray = mergeResultArrays($cpuPoints, $hdPoints, 'experiment', array('cpu'), array('disk'), null);

	return $mergedArray = mergeResultArrays($mergedArray, $nasPoints, 'experiment', array('cpu', 'disk'), array('tape'), 0);

	return $mergedArray = mergeResultArrays($mergedArray, $nasPoints, 'experiment', array('cpu', 'disk'), array('tape'), null);





}

}

index.html

+2 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ 
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">

    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">





    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">

    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">

    <link rel="stylesheet" href="libs/jquery-ui-1.12.1/jquery-ui.css">

    <script src="libs/jquery-ui-1.12.1/jquery-ui.js"></script>

  </head>

  </head>

  <body>

  <body>