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

v.2.02.0 beta: 

- Updates
parent 31e4158d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1945 additions and 1770 deletions
app/app.config.js
+ 1
− 1
View file @ f0a622e8
......@@ -116,7 +116,7 @@ config(['$locationProvider', '$routeProvider',
when('/gaugehist/:elemId/:days?', {
template: '<gaugehist></gaugehist>'
}).
when('/groundplanes', {
when('/groundplanes/:days?', {
template: '<groundplanes></groundplanes>'
}).
when('/cachedhist/:elemId', {
......
app/beamplug/beamplug.template.html
+ 0
− 0
View file @ f0a622e8
No preview for this file type
app/cryogenics/cryogenics.template.html
+ 1
− 5
View file @ f0a622e8
......@@ -60,8 +60,4 @@
TE0140<br/><span style="font-size: 1.5vmin;">(Type 2)</span>: <a target="_blank" href="#!/histogram/NP04_DCS_01_TE0140"><span class="value">{{ $ctrl.NP04_DCS_01_TE0140 | number: 1 }} &#8490;</span></a></td>
</tr>
</table>
</div>
</div>
\ No newline at end of file
\ No newline at end of file
app/css/east.css
+ 0
− 1
View file @ f0a622e8
......@@ -146,5 +146,4 @@
top: 30vw;
right: 15vw;
}
}
\ No newline at end of file
app/css/groundplanes.css
+ 104
− 8
View file @ f0a622e8
......@@ -19,7 +19,7 @@
#cryostat_pressure {
position: fixed;
left: 5vw;
top: 40vh;
top: 30vh;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
......@@ -28,7 +28,7 @@
#ambient {
position: fixed;
right: 5vw;
right: 40vw;
top: 80vh;
text-align: right;
color: gray;
......@@ -36,6 +36,30 @@
font-size: 1.7vmin;
}
#days {
position: fixed;
top: 6%;
left: 60%;
width: 35%;
height: 3%;
}
#container0 {
position: fixed;
top: 10%;
left: 65%;
width: 35%;
height: 40%;
}
#container1 {
position: fixed;
top: 50%;
left: 65%;
width: 35%;
height: 40%;
}
}
@media screen and (min-height: 1080px) and (max-height: 2000px) {
......@@ -59,7 +83,7 @@
#cryostat_pressure {
position: fixed;
left: 5vw;
top: 40vh;
top: 30vh;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
......@@ -68,7 +92,7 @@
#ambient {
position: fixed;
right: 5vw;
right: 40vw;
top: 80vh;
text-align: right;
color: gray;
......@@ -76,6 +100,30 @@
font-size: 1.7vmin;
}
#days {
position: fixed;
top: 6%;
left: 60%;
width: 35%;
height: 3%;
}
#container0 {
position: fixed;
top: 10%;
left: 65%;
width: 35%;
height: 40%;
}
#container1 {
position: fixed;
top: 50%;
left: 65%;
width: 35%;
height: 40%;
}
}
@media screen and (min-height: 1100px) {
......@@ -98,7 +146,7 @@
#cryostat_pressure {
position: fixed;
left: 5vw;
left: 50vw;
top: 40vh;
text-align: right;
color: gray;
......@@ -108,7 +156,7 @@
#ambient {
position: fixed;
right: 10vw;
right: 40vw;
top: 85vh;
text-align: right;
color: gray;
......@@ -116,6 +164,30 @@
font-size: 1.7vmin;
}
#days {
position: fixed;
top: 6%;
left: 60%;
width: 35%;
height: 3%;
}
#container0 {
position: fixed;
top: 10%;
left: 65%;
width: 35%;
height: 40%;
}
#container1 {
position: fixed;
top: 50%;
left: 65%;
width: 35%;
height: 40%;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -152,12 +224,36 @@
#ambient {
position: fixed;
right: 5vw;
top: 20vh;
right: 50vw;
top: 80vh;
text-align: right;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 1.7vmin;
}
#days {
position: fixed;
top: 6%;
left: 60%;
width: 35%;
height: 3%;
}
#container0 {
position: fixed;
top: 10%;
left: 60%;
width: 40%;
height: 40%;
}
#container1 {
position: fixed;
top: 50%;
left: 60%;
width: 40%;
height: 40%;
}
}
\ No newline at end of file
app/groundplanes/groundplanes.component.js
+ 122
− 2
View file @ f0a622e8
'use strict';
angular.module('groundplanes', []).component('groundplanes', {
templateUrl: 'groundplanes/groundplanes.template.html',
controller: function groundplanesController($scope, $http, $q, $interval) {
controller: ['$routeParams', '$scope', '$window', '$http', '$interval',
function groundplanesController($routeParams, $scope, $window, $http, $interval) {
this.pageTitle = "NP04 Heinzinger High Voltage";
this.natalie = 1;
let self = this;
if ($routeParams.days != null) {
console.log(this.days);
this.days = $routeParams.days;
} else {
this.days = 0.33;
}
var fundays = this.days;
this.dayChanger = function (fundays) {
$window.location.href = "#!/groundplanes/" + fundays;
};
this.elements = [
[[47894757376282,'NP04_DCS_01:Heinz_I.']],
[[48002299330842,'NP04_DCS_01:Heinz_V_Cathode.']]];
this.reload = function () {
$http.get("php-db-conn/cachedVals.conn.php?elemId=groundplanes").then(function (resultArr) {
......@@ -51,6 +69,108 @@ angular.module('groundplanes', []).component('groundplanes', {
console.log("interval occured");
function getData (chart, days) {
var counter = 0;
var arr = [];
console.log("days = " + days);
var len = self.elements[chart].length;
for (var j = 0; j < self.elements[chart].length; j++) {
var dt = [];
$http.get("php-db-conn/histogram.conn.php?elemId=" + self.elements[chart][j][1] + "&days=" + days).then(function onSuccess(response) {
dt.push(response.data.records);
counter+=1;
if (counter === len) {
createSeriesOptions(chart, dt);
}
return response.data.records;
}).catch(function onError(data) {
counter+=1;
dt.push(moment(moment()) + ",0");
});
}
}
function createSeriesOptions (chart, data) {
var series = [];
var counter = 0;
var nm = [];
for (var j = 0; j < self.elements[chart].length; j++) {
nm.push(self.elements[chart][j][1]);
}
angular.forEach(nm, function () {
series[counter] = {
name: nm[counter],
type: 'line',
data: data[counter],
lineWidth: 1.0
};
counter += 1;
if (counter === nm.length) {
createChart(series, 'container'+chart);
return series;
}
});
};
function createChart(seriesOptions, divID) {
var options = seriesOptions;
var ch = Highcharts.stockChart(divID, {
chart: {
zoomType: 'xy'
},
legend: {
enabled: true,
align: 'center',
verticalAlign: 'top',
itemStyle: {
fontSize: '0.5vw'
}
},
time: {
useUTC: false
},
scrollbar: {
enabled: false
},
navigator: {
enabled: false
},
rangeSelector: {
enabled: false
},
tooltip: {
valueDecimals: 5
},
xAxis: {
type: 'datetime',
ordinal: false
},
yAxis: {
useHTML: true,
},
series: options
});
}
for (var i = 0; i<self.elements.length; i++) {
getData(i, fundays);
}
};
this.promise;
......@@ -72,4 +192,4 @@ angular.module('groundplanes', []).component('groundplanes', {
$scope.stop();
});
}
});
\ No newline at end of file
]});
\ No newline at end of file
app/groundplanes/groundplanes.template.html
+ 0
− 0
View file @ f0a622e8
No preview for this file type
app/img/east.png
+ 0
− 0
View replaced file @ 31e4158d View file @ f0a622e8
app/img/east.png

13 KiB | W: | H:

app/img/east.png

122 KiB | W: | H:

app/img/east.png
app/img/east.png
app/img/east.png
app/img/east.png
  • 2-up
  • Swipe
  • Onion skin
app/img/north.png
+ 0
− 0
View replaced file @ 31e4158d View file @ f0a622e8
app/img/north.png

12.6 KiB | W: | H:

app/img/north.png

133 KiB | W: | H:

app/img/north.png
app/img/north.png
app/img/north.png
app/img/north.png
  • 2-up
  • Swipe
  • Onion skin
app/img/south.png
+ 0
− 0
View replaced file @ 31e4158d View file @ f0a622e8
app/img/south.png

11.9 KiB | W: | H:

app/img/south.png

131 KiB | W: | H:

app/img/south.png
app/img/south.png
app/img/south.png
app/img/south.png
  • 2-up
  • Swipe
  • Onion skin
app/img/west.png
+ 0
− 0
View replaced file @ 31e4158d View file @ f0a622e8
app/img/west.png

12.8 KiB | W: | H:

app/img/west.png

122 KiB | W: | H:

app/img/west.png
app/img/west.png
app/img/west.png
app/img/west.png
  • 2-up
  • Swipe
  • Onion skin
app/purity/purity.component.js
+ 18
− 24
View file @ f0a622e8
......@@ -48,30 +48,24 @@ angular.module('purity', []).component('purity', {
self.NP04_DCS_01_PrM2_PrM_Q_A = rArr[27];
self.NP04_DCS_01_PrM2_PrM_T_A = rArr[28];
self.NP04_DCS_01_PrM2_PrM_BL_A = rArr[29];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_Status_On = rArr[30];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementSenseVoltage__online___value = rArr[31];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementCurrent__online___value = rArr[32];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementTemperature__online___value = rArr[33];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_Status_On = rArr[34];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementSenseVoltage__online___value = rArr[35];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementCurrent__online___value = rArr[36];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementTemperature__online___value = rArr[37];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_Status_On = rArr[38];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementSenseVoltage__online___value = rArr[39];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementCurrent__online___value = rArr[40];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementTemperature__online___value = rArr[41];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_Status_On = rArr[42];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementSenseVoltage__online___value = rArr[43];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementCurrent__online___value = rArr[44];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementTemperature__online___value = rArr[45];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_Status_On = rArr[46];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementSenseVoltage__online___value = rArr[47];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementCurrent__online___value = rArr[48];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementTemperature__online___value = rArr[49];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_Status_On = rArr[50];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementSenseVoltage__online___value = rArr[51];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementCurrent__online___value = rArr[52];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementTemperature__online___value = rArr[53];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementSenseVoltage__online___value = rArr[30];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementCurrent__online___value = rArr[31];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementTemperature__online___value = rArr[32];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementSenseVoltage__online___value = rArr[33];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementCurrent__online___value = rArr[34];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementTemperature__online___value = rArr[35];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementSenseVoltage__online___value = rArr[36];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementCurrent__online___value = rArr[37];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementTemperature__online___value = rArr[38];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementSenseVoltage__online___value = rArr[39];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementCurrent__online___value = rArr[40];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementTemperature__online___value = rArr[41];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementSenseVoltage__online___value = rArr[42];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementCurrent__online___value = rArr[43];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementTemperature__online___value = rArr[44];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementSenseVoltage__online___value = rArr[45];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementCurrent__online___value = rArr[46];
self.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementTemperature__online___value = rArr[47];
console.log("interval occured");
self.timestamp = rArr[rArr.length-1] * 1000;
......
app/purity/purity.template.html
+ 0
− 24
View file @ f0a622e8
......@@ -44,10 +44,6 @@
<td>Anode baseline voltage:</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_PrM0_PrM_BL_A"><span class="value">{{ $ctrl.NP04_DCS_01_PrM0_PrM_BL_A | number: 5 }} V</span></a></td>
</tr>
<tr>
<td>Cathode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Cathode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......@@ -60,10 +56,6 @@
<td>Cathode Measurement Temperature</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementTemperature"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel00_MeasurementTemperature__online___value | number: 5 }} &#8451;</span></a></td>
</tr>
<tr>
<td>Anode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Anode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel00_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......@@ -118,10 +110,6 @@
<td>Anode baseline voltage:</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_PrM1_PrM_BL_A"><span class="value">{{ $ctrl.NP04_DCS_01_PrM1_PrM_BL_A | number: 5 }} V</span></a></td>
</tr>
<tr>
<td>Cathode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Cathode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......@@ -134,10 +122,6 @@
<td>Cathode Measurement Temperature</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementTemperature"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel01_MeasurementTemperature__online___value | number: 5 }} &#8451;</span></a></td>
</tr>
<tr>
<td>Anode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Anode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel01_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......@@ -192,10 +176,6 @@
<td>Anode baseline voltage:</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_PrM2_PrM_BL_A"><span class="value">{{ $ctrl.NP04_DCS_01_PrM2_PrM_BL_A | number: 5 }} V</span></a></td>
</tr>
<tr>
<td>Cathode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Cathode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......@@ -208,10 +188,6 @@
<td>Cathode Measurement Temperature</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementTemperature"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board2_Channel02_MeasurementTemperature__online___value | number: 5 }} &#8451;</span></a></td>
</tr>
<tr>
<td>Anode Voltage On/Off Status</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_Status_On"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_Status_On == 1 ? "On" : "Off" }} </span></a></td>
</tr>
<tr>
<td>Anode Sense Voltage</td>
<td><a target="_blank" ng-href="#!/histogram/NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementSenseVoltage"><span class="value"> {{ $ctrl.NP04_DCS_01_Wiener_MPOD_PrM_Board3_Channel02_MeasurementSenseVoltage__online___value | number: 5 }} V</span></a></td>
......
e2e-tests/protractor.conf.js
+ 1
− 1
View file @ f0a622e8
......@@ -8,7 +8,7 @@ exports.config = {
],
capabilities: {
'browserName': 'chrome'
browserName: 'chrome'
},
baseUrl: 'http://localhost:8000/',
......
package-lock.json
+ 1698
− 1704
View file @ f0a622e8
This diff is collapsed.
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