--- a/calls.json.php
+++ b/calls.json.php
@@ -1,35 +1,8 @@
 <?php
 
-function view($sensorID) {
-    $data = Array("sensorID" => $sensorID,
-    );
-    $timefrom = 1;
-    $timeto = 1;
-    $years = $this->Sensor_model->getSensorDataYears($sensorID, $timefrom, $timeto);
-    foreach ($years as $year) {
-        $yearsItem[] = Array("title" => $year['year'], "link" => "#",
-            "onclick" => "getData('$sensorID'," . mktime(0, 0, 0, 1, 1, $year['year']) . "," . mktime(0, 0, 0, 12, 31, $year['year']) . ");");
-    }
-    $months = $this->Sensor_model->getSensorDataMonths($sensorID, $timefrom, $timeto);
-    foreach ($months as $month) {
-        $monthsItem[] = Array("title" => date("F", mktime(0, 0, 0, $month['month'], 10)) . ' ' . $month['year'], "link" => "#",
-            "onclick" => "getData('$sensorID'," . mktime(0, 0, 0, $month['month'], 1, $month['year']) . "," . strtotime("+1 month", mktime(0, 0, 0, $month['month'], 1, $month['year'])) . ");");
-    }
-    $days = $this->Sensor_model->getSensorDataDays($sensorID, $timefrom, $timeto);
-    foreach ($days as $day) {
-        $daysItem[] = Array("title" => date("jS F", mktime(0, 0, 0, $day['month'], $day['day'])), "link" => "#",
-            "onclick" => "getData('$sensorID'," . mktime(0, 0, 0, $day['month'], $day['day'], $day['year']) . "," . mktime(23, 59, 59, $day['month'], $day['day'], $day['year']) . ");");
-    }
-
-    $data['sidebar'] = Array("years" => $yearsItem, "months" => $monthsItem, "days" => $daysItem
-    );
-    $this->javascript = Array("flot/jquery.flot.min.js", "flot/jquery.flot.resize.min.js", "flot/jquery.flot.crosshair.min.js");
-    $this->content = $this->load->view('pages/sensor/view', $data, true);
-    $this->render_page();
-}
 
 function json_graph($sensorID, $timefrom, $timeto) {
-    $values = $this->Sensor_model->getSensorValuesByHour($sensorID, $timefrom, $timeto);
+    $values = getSensorValuesByHour($sensorID, $timefrom, $timeto);
     $label = $sensorID;
     $data = Array();
     $tzoffset = $this->get_timezone_offset("UTC");
@@ -53,15 +26,13 @@
 function json_data_description($sensorID, $timefrom, $timeto) {
     $timefrom = strtotime($timefrom);
     $timeto = strtotime($timeto);
-    $years = $this->Sensor_model->getSensorDataYears($sensorID, $timefrom, $timeto);
+    $years = getSensorDataYears($sensorID, $timefrom, $timeto);
 
-    $months = $this->Sensor_model->getSensorDataMonths($sensorID, $timefrom, $timeto);
-    $days = $this->Sensor_model->getSensorDataDays($sensorID, $timefrom, $timeto);
+    $months = getSensorDataMonths($sensorID, $timefrom, $timeto);
+    $days = getSensorDataDays($sensorID, $timefrom, $timeto);
 
-    $this->output
-            ->set_content_type('application/json')
-            ->set_output(json_encode(Array("years" => $years, "months" => $months, "days" => $days
-                    )));
+    return json_encode(Array("years" => $years, "months" => $months, "days" => $days
+                    ));
 }
 
 ?>