Skip to content
Snippets Groups Projects
Commit 09b27cac authored by giosal's avatar giosal
Browse files

v5.0.2 

- Fixed a bug on 'groundplanes' page that didn't allow retrieval of charts. Was passing element Name instead of ID to histogram
parent 985fee62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
-dev/cgi-bin/.htaccess 0 → 100644
+ 19
− 0
View file @ 09b27cac
# *** This htaccess file has been generated automatically on November 06, 2020 ***
# Due to the end-of-life of SLC6 and Apache 2.2, web sites get migrated to a new infratructure running
# CC7 and Apache 2.4. Some settings previously managed in the old webservices site management interface
# have been moved to .htaccess files.
# See https://cern.service-now.com/service-portal/?id=outage&n=OTG0059516
<IfVersion >= 2.3>
# Enable CGI scripts execution in this folder in the new Apache 2.4 infrastructure.
# This folder was previously CGI-enabled using a setting in the old webservices site management interface.
Options +ExecCGI
SetHandler cgi-script
# The old infrastructure supported php scripts in CGI-enabled folders, preserve that behavior for migrated sites.
<FilesMatch \.php$>
SetHandler application/x-httpd-php
</FilesMatch>
</IfVersion>
.gitignore
+ 0
− 1
View file @ 09b27cac
......@@ -2,7 +2,6 @@ logs/*
!.gitkeep
node_modules/
bower_components/
app/static/straingauges.xslx
tmp
.DS_Store
.idea
\ No newline at end of file
.jshintrc
+ 1
− 1
View file @ 09b27cac
......@@ -2,7 +2,7 @@
"strict": "global",
"globals": {
// Angular
"angular": false,
"angular": true,
// Angular mocks
"module": false,
......
app/camera-test/cam203-paella.html 0 → 100644
+ 107
− 0
View file @ 09b27cac
<html>
<head>
<title>NP04 Cameras</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
<link rel="stylesheet" href="../css/camera-test.css"/>
<!--script type="text/javascript" src="../paella/player/javascript/swfobject.js"></script-->
<script type="text/javascript" src="../paella/player/javascript/base.js"></script>
<script type="text/javascript" src="../paella/player/javascript/jquery.min.js"></script>
<script type="text/javascript" src="../paella/player/javascript/lunr.min.js"></script>
<script type="text/javascript" src="../paella/player/javascript/require.js"></script>
<script type="text/javascript" src="../paella/player/javascript/paella_player_es2015.js"></script>
<!--script type="text/javascript" src="../paella/player/javascript/hls.min.js"></script-->
<link rel="stylesheet" href="../paella/player/resources/bootstrap/css/bootstrap.min.css" type="text/css" media="screen" charset="utf-8">
<script>
/* Set the width of the side navigation to 250px and the left margin of the page content to 250px */
function openNav() {
document.getElementById("menu").style.width = "30vw";
}
/* Set the width of the side navigation to 0 and the left margin of the page content to 0 */
function closeNav() {
document.getElementById("menu").style.width = "0";
}
</script>
</head>
<body onload="paella.load('cam203',{autoplay: true});">
<img src="../img/menu_icon.png" onclick="openNav()" style="position: absolute; left: 1vw; top: 1vh; background-color: floralwhite; width: 50px;"/>
<div id="menu" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/">Home</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/cryostat">NP04 Cryostat</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/gauges">NP04 Gauges</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/inside">NP04 T-Insulation</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/tinternal">NP04 T-Internal</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/multiplexer">NP04 Temperature map</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/purity">NP04 Purity Monitors</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/camera-test/index.html">NP04 Cameras</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/zmonitor">NP04 Z-monitor</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/crate/1">NP04 WIB crates</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/pl506">NP04 CE PL506</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/mpodpd">NP04 Photon Detectors</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/mpodcehv">NP04 High Voltage</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/comissioning">NP04 Comissioning</a>
<a href="https://np04-slow-control.web.cern.ch/np04-slow-control/app/#!/beamplug">NP04 Beam plug</a>
<a href="mailto:George.Salukvadze@cern.ch">Contact</a>
</div>
<!– player container –>
<div id="cam203" class="" style="display:block; position: absolute; left: 10vw; top: 5vh; width: 56vw; height: 42vw;"></div>
<div id="camChooser" style="position: absolute; right: 5vw; top: 10vh;">
<input type="button" value="CAM-001" onclick="window.location.href='cam001.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-002" onclick="window.location.href='cam002.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-004" onclick="window.location.href='cam004.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-005" onclick="window.location.href='cam005.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-101" onclick="window.location.href='cam101.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-102" onclick="window.location.href='cam102.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-103" onclick="window.location.href='cam103.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-104" onclick="window.location.href='cam104.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-105" onclick="window.location.href='cam105.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-201" onclick="window.location.href='cam201.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-202" onclick="window.location.href='cam202.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-203" onclick="window.location.href='cam203.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR00" onclick="window.location.href='wa105ir00.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR01" onclick="window.location.href='wa105ir01.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR02" onclick="window.location.href='wa105ir02.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR03" onclick="window.location.href='wa105ir03.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
</div>
<div id="time" style="position: absolute; left: 30vw; bottom: 5vh; color: #dddddd; font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;"></div>
<script type="text/javascript">
//paella.load('cam203', {data: '.'});
/*var cam203var = new THEOplayer.Player(cam203el, {
libraryLocation : 'https://cdn.theoplayer.com/dash/7cff09f1-2b5a-4bb1-ad38-bec2080af846/'
});
cam203var.autoplay = true;
cam203var.source = {
sources : [{
src : 'https://wowza03.cern.ch/np04detector/np04-cam-203.stream/playlist.m3u8',
type : 'application/x-mpegurl',
ui : {fluid: true}
}]
};*/
function updateDate() {
var options = { day: 'numeric', month: 'numeric', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', timeZoneName: 'short' };
d = new Date();
document.getElementById("time").innerHTML = d.toLocaleDateString('it-CH', options);
}
setInterval(updateDate, 1000);
</script>
</body>
</html>
\ No newline at end of file
app/camera-test/cam203.html
+ 6
− 2
View file @ 09b27cac
......@@ -44,8 +44,12 @@
</div>
<!– player container –>
<div id="warning" style="position:absolute; top: 1vh; left: 15vw; font-family: 'Arial Black', Gadget, sans-serif; color: white;">
In case of problems with the stream please be so kind to use VLC player. Click File->Open Network Stream... and paste the following URL:<br/>
<a href="https://wowza.cern.ch/np04detector/np04-cam-203.stream/playlist.m3u8">https://wowza.cern.ch/np04detector/np04-cam-203.stream/playlist.m3u8</a>
</div>
<div id="cam203" class="theoplayer-container video-js theoplayer-skin" style="position: absolute; left: 10vw; top: 5vh; width: 56vw; height: 42vw;"></div>
<div id="cam203" class="theoplayer-container video-js theoplayer-skin" style="position: absolute; left: 10vw; top: 15vh; width: 56vw; height: 42vw;"></div>
<div id="camChooser" style="position: absolute; right: 5vw; top: 10vh;">
<input type="button" value="CAM-001" onclick="window.location.href='cam001.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-002" onclick="window.location.href='cam002.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
......@@ -64,7 +68,7 @@
<input type="button" value="WA105IR02" onclick="window.location.href='wa105ir02.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR03" onclick="window.location.href='wa105ir03.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
</div>
<div id="time" style="position: absolute; left: 30vw; bottom: 5vh; color: #dddddd; font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;"></div>
<div id="time" style="position: absolute; left: 30vw; bottom: 2vh; color: #dddddd; font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;"></div>
<script type="text/javascript">
var cam203el = document.querySelector('#cam203');
......
app/camera-test/index.html
+ 2
− 2
View file @ 09b27cac
......@@ -56,7 +56,7 @@
<input id="cam105" type="button" value="CAM-105" onclick="window.location.href='player.html?id=cam105'"/><br/>
<input id="cam201" type="button" value="CAM-201" onclick="window.location.href='player.html?id=cam201'"/><br/>
<input id="cam202" type="button" value="CAM-202" onclick="window.location.href='player.html?id=cam202'"/><br/>
<input id="cam203" type="button" value="CAM-203" onclick="window.location.href='player.html?id=cam203'"/><br/>
<input id="cam203" type="button" value="CAM-203" onclick="window.location.href='cam203.html'"/><br/>
<div id="camChooser" style="position: absolute; right: 5vw; top: 10vh;">
<input type="button" value="CAM-001" onclick="window.location.href='player.html?id=cam001'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
......@@ -70,7 +70,7 @@
<input type="button" value="CAM-105" onclick="window.location.href='player.html?id=cam105'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-201" onclick="window.location.href='player.html?id=cam201'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-202" onclick="window.location.href='player.html?id=cam202'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-203" onclick="window.location.href='player.html?id=cam203'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-203" onclick="window.location.href='cam203.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR00" onclick="window.location.href='player.html?wa105ir00'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR01" onclick="window.location.href='player.html?wa105ir01'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR02" onclick="window.location.href='player.html?wa105ir02'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
......
app/camera-test/player.html
+ 1
− 1
View file @ 09b27cac
......@@ -62,7 +62,7 @@
<input type="button" value="CAM-105" onclick="window.location.href='player.html?id=cam105'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-201" onclick="window.location.href='player.html?id=cam201'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-202" onclick="window.location.href='player.html?id=cam202'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-203" onclick="window.location.href='player.html?id=cam203'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="CAM-203" onclick="window.location.href='cam203.html'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR00" onclick="window.location.href='player.html?wa105ir00'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR01" onclick="window.location.href='player.html?wa105ir01'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
<input type="button" value="WA105IR02" onclick="window.location.href='player.html?wa105ir02'" style="font-family: 'Arial Black', Gadget, sans-serif; font-size: 2.5vmin;"/><br/>
......
app/groundplanes/groundplanes.component.js
+ 1
− 1
View file @ 09b27cac
......@@ -77,7 +77,7 @@ angular.module('groundplanes', []).component('groundplanes', {
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) {
$http.get("php-db-conn/histogram.conn.php?elemId=" + self.elements[chart][j][0] + "&days=" + days).then(function onSuccess(response) {
dt.push(response.data.records);
counter+=1;
if (counter === len) {
......
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