Skip to content
Snippets Groups Projects
Commit f7a31dfd authored by George Salukvadze's avatar George Salukvadze
Browse files

v 1.08.4 

- Small fixes and changes
TODO:
parent 86585297
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/cachedhist/cachedhist.component.js
+ 23
− 42
View file @ f7a31dfd
......@@ -28,44 +28,23 @@ angular.module('cachedhist', []).component('cachedhist', {
//self.PlotData.push(self.values);
//self.PlotCat.push(self.labels);
if (self.elemId === "NP04_DCS_01_Heinz_I" || self.elemId === "NP04_DCS_01_Heinz_V_Cathode." || self.elemId === "NP04_DCS_01_Heinz_V_Raw") {
Highcharts.chart('container', {
chart: {
zoomType: 'xy'
},
time: {
useUTC: false
},
title: {
text: self.elemId
},
tooltip: {
valueDecimals: 5
},
xAxis: {
type: 'datetime'
},
series: [{
data: response.data,
type: 'line',
lineWidth: 1.0,
tooltip: {
valueDecimals: 5
},
name: 'Values',
color: '#ff0000'
}]
});
} else {
let finaldata = [];
let k = 0;
console.log(response.data[0].length);
for (let i = 0; i < response.data.length; i++) {
for (let j = 0; j < response.data[i].length; j++) {
//console.log(i);
finaldata.push(response.data[i][j]);
}
}
console.log(finaldata);
/*$http.get("php-db-conn/histogram.conn.php?elemId=" + self.elemId + "&days=1.08").then(function onSuccess(resp) {
for (let i = 0; i < resp.data.length; i++) {
finaldata.push(resp.data[i]);
}*/
Highcharts.stockChart('container', {
chart: {
zoomType: 'xy'
},
......@@ -124,19 +103,21 @@ angular.module('cachedhist', []).component('cachedhist', {
},
xAxis: {
type: 'datetime'
type: 'datetime',
ordinal: false
},
series: [{
data: response.data,
data: finaldata,
lineWidth: 1.0,
name: 'Values',
color: '#ff0000'
}]
});
}
}).catch(function onError(d) {
console.log(d);
});
//self.respdata = response.data.records;
//for (let i = 0; i < self.respdata.length; i++) {
//self.respdata[i][0] = moment.unix(self.respdata[i][0]/1000).format('DD/MM/YYYY HH:mm:ss');
......@@ -146,9 +127,9 @@ angular.module('cachedhist', []).component('cachedhist', {
//} else {
//self.dayChanger(3);
//}
}).catch(function onError(data) {
/*}).catch(function onError(data) {
console.log(data);
});
});*/
};
this.promise;
......
app/cachedhist/cachedhist.template.html
+ 0
− 14
View file @ f7a31dfd
......@@ -5,20 +5,6 @@
}
</style>
<div id="timespan" style="position: absolute; left: 10%; top: 1%;">
<span id="historyLabel" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 18px; color: white">History for:</span>
<br/>
<button id="1hour" type="button" ng-click="$ctrl.dayChanger(0.125)">1 hour</button>
<button id="6hours" type="button" ng-click="$ctrl.dayChanger(0.33)">6 hours</button>
<button id="12hours" type="button" ng-click="$ctrl.dayChanger(0.58)">12 hours</button>
<button id="1day" type="button" ng-click="$ctrl.dayChanger(1.08)">1 day</button>
<button id="3days" type="button" ng-click="$ctrl.dayChanger(3.08)">3 days</button>
<button id="7days" type="button" ng-click="$ctrl.dayChanger(7.08)">7 days</button>
<button id="10days" type="button" ng-click="$ctrl.dayChanger(10.08)">10 days</button>
<!--button id="reset-zoom" type="button" ng-click="$ctrl.chart.resetZoom()">Reset zoom</button-->
</div>
<div id="container">Placeholder for chart</div>
......
app/groundplanes/groundplanes.template.html
+ 4
− 4
View file @ f7a31dfd
......@@ -9,7 +9,7 @@
<tr>
<td>Channel 1 - UP-DS-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch01"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch01 | number: 5 }} V</span></a></td>
<td>Channel 2 - UP-DS-DL: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch02"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch02 | number: 5 }} V</span></a></td>
<td>Current (Measured): <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_I/1"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_I | number: 5}} &#181;A</span></a></td>
<td>Current (Measured): <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_I"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_I | number: 5}} &#181;A</span></a></td>
</tr>
<tr>
<td>Channel 3 - UP-MS-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch03"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch03 | number: 5 }} V</span></a></td>
......@@ -19,17 +19,17 @@
<tr>
<td>Channel 5 - UP-US-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch05"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch05 | number: 5 }} V</span></a></td>
<td>Channel 6 - UP-US-DL: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch06"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch06 | number: 5 }} V</span></a></td>
<td>Cathode Voltage: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_V_Cathode./1"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Cathode | number: 5}} V</span></a></td>
<td>Cathode Voltage: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_V_Cathode."><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Cathode | number: 5}} V</span></a></td>
</tr>
<tr>
<td>Channel 7 - DN-DS-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch07"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch07 | number: 5 }} V</span></a></td>
<td>Channel 8 - DN-DS-DL: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch08"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch08 | number: 5 }} V</span></a></td>
<td>Voltage Raw: <a target="_blank" ng-href="#!/cachedhist/48001913454874"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Raw | number: 5}} V</span></a></td>
<td>Voltage Raw: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_V_Raw"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Raw | number: 5}} V</span></a></td>
</tr>
<tr>
<td>Channel 9 - DN-MS-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch09"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch09 | number: 5 }} V</span></a></td>
<td>Channel 10 - DN-MS-DL: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch10"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch10 | number: 5 }} V</span></a></td>
<td>Cathode V 97MOhms: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_V_Cathode_97MOhms."><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Cathode_97MOhms | number: 5}} V</span></a></td>
<td>Cathode V 97MOhms: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Heinz_V_Cathode_97MOhms"><span class="value">{{ $ctrl.NP04_DCS_01_Heinz_V_Cathode_97MOhms | number: 5}} V</span></a></td>
</tr>
<tr>
<td>Channel 11 - DN-US-BR: <a target="_blank" ng-href="#!/histogram/NP04_DCS_01_GroundPlanes_Ch11"><span class="value">{{ $ctrl.NP04_DCS_01_GroundPlanes_Ch11 | number: 5 }} V</span></a></td>
......
app/histogram/histogram.component.js
+ 8
− 2
View file @ f7a31dfd
......@@ -40,7 +40,10 @@ angular.module('histogram', []).component('histogram', {
if (self.elemId === "NP04_DCS_01_Heinz_I" || self.elemId === "NP04_DCS_01_Heinz_V_Cathode." || self.elemId === "NP04_DCS_01_Heinz_V_Raw") {
Highcharts.chart('container', {
chart: {
type: 'line',
zoomType: 'xy'
},
......@@ -57,7 +60,8 @@ angular.module('histogram', []).component('histogram', {
},
xAxis: {
type: 'datetime'
type: 'datetime',
ordinal: false
},
series: [{
......@@ -76,6 +80,7 @@ angular.module('histogram', []).component('histogram', {
Highcharts.stockChart('container', {
chart: {
type: 'spline',
zoomType: 'xy'
},
......@@ -137,7 +142,8 @@ angular.module('histogram', []).component('histogram', {
},
xAxis: {
type: 'datetime'
type: 'datetime',
ordinal: false
},
series: [{
......
app/php-db-conn/cachehist.conn.php
+ 10
− 6
View file @ f7a31dfd
<?php
set_time_limit(0);
ini_set('memory_limit', '6G');
ini_set('memory_limit', '16G');
ini_set('error_reporting', E_ALL);
ini_set('display_errors', true);
......@@ -14,16 +14,20 @@
for ($i = $week; $i < date(strtotime('-1 days')); $i+=86400) {
$json = json_decode(file_get_contents('http://epdtdi-vm-01.cern.ch:5000/day/'. date('Y-m-d', $i) .'/'.$elemId));
for ($j = 0; $j < count($json); $j++) {
$temp = array_merge($temp, $json[$j]);
for ($j = 0; $j < count($json); $j=$j+10) {
// for ($k = 0; $k < count($json[$j]); $k++) {
array_push($temp, $json[$j]);
//echo "Push";
// }
//$temp = array_merge($temp, $json[$j]);
}
$data = array_merge($data, $temp);
//$data = array_merge($data, $temp);
}
sort($data);
//print_r($data);
echo(json_encode($data));
echo(json_encode($temp));
?>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment