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

v 0.45.0 

- Prepared backend for 'tInternal' component
- Small fixes and changes
TODO:
- Optimize database connectivity
parent 31eb7c5c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 418 additions and 7 deletions
app/bottom/bottom.template.html
+ 2
− 0
View file @ 7fd80154
......@@ -4,6 +4,8 @@
<img id="detector" src="img/bottom1.png" alt="Bottom1"/>
<img id="second" src="img/bottom2.png" alt=""/>
<img id="old" src="img/bottom.png" alt="Bottom old"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="tss001AABA">TSS 001 AA/BA</div>
......
app/camera/camera.template.html
+ 3
− 1
View file @ 7fd80154
......@@ -2,7 +2,9 @@
<link rel="stylesheet" href="css/VLCPlayer.css">
<div class="crate_container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img src="http://protodune-dp01.cern.ch/video1.mjpeg" style="position: absolute; top: 20vh; left: 20vw; height: 75vh;"></img>
<a href="http://np04-cam-201.cern.ch/video1.mjpeg" target="_blank"><img id="cam-201" src="http://np04-cam-201.cern.ch/video1.mjpeg" style="position: absolute; top: 70vh; left: 20vw; width: 25vh;"/></a>
<a href="http://np04-cam-202.cern.ch/video1.mjpeg" target="_blank"><img id="cam-202" src="http://np04-cam-202.cern.ch/video1.mjpeg" style="position: absolute; top: 70vh; left: 40vw; width: 25vh;"></a>
<a href="http://np04-cam-203.cern.ch/video1.mjpeg" target="_blank"><img id="cam-203" src="http://np04-cam-203.cern.ch/video1.mjpeg" style="position: absolute; top: 70vh; left: 60vw; width: 25vh;"></a>
<vlcplayer vlc-url="rtsp://protodune-dp01.cern.ch:554" vlc-filename="live1.sdp" vlc-autoplay="true"></vlcplayer>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
</div>
\ No newline at end of file
app/cryostat/cryostat.template.html
+ 3
− 3
View file @ 7fd80154
......@@ -3,14 +3,14 @@
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/cryostat.png" alt="Cryostat"/>
<div id="outer_pressure">Outer pressure ABS:<br/><a target="_blank" href="#!/histogram/NP04_PT0104AI"><span class="value">{{ $ctrl.NP04_PT0104AI[0].Mnish | number: 1 }} mbar</span></a><br/>Outer pressure Diff:<br/><a target="_blank" href="#!/histogram/NP04_PT0105AI"><span class="value">{{ $ctrl.NP04_PT0105AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="inner_pressure">Inner pressure ABS:<br/><a target="_blank" href="#!/histogram/NP04_PT0100AI"><span class="value">{{ $ctrl.NP04_PT0100AI[0].Mnish | number: 1 }} mbar</span></a><br/>Inner pressure Diff:<br/><a target="_blank" href="#!/histogram/NP04_PT0101AI"><span class="value">{{ $ctrl.NP04_PT0101AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="outer_pressure">Outer pressure ABS (PT0104):<br/><a target="_blank" href="#!/histogram/NP04_PT0104AI"><span class="value">{{ $ctrl.NP04_PT0104AI[0].Mnish | number: 1 }} mbar</span></a><br/>Outer pressure Diff (PT0105):<br/><a target="_blank" href="#!/histogram/NP04_PT0105AI"><span class="value">{{ $ctrl.NP04_PT0105AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="inner_pressure">Inner pressure ABS (PT0100):<br/><a target="_blank" href="#!/histogram/NP04_PT0100AI"><span class="value">{{ $ctrl.NP04_PT0100AI[0].Mnish | number: 1 }} mbar</span></a><br/>Inner pressure Diff (PT0101):<br/><a target="_blank" href="#!/histogram/NP04_PT0101AI"><span class="value">{{ $ctrl.NP04_PT0101AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="ambient_diff"><span style="font-size: 2.3vmin">Difference with<br/>ambient pressure:</span><br/>Outer pressure:<br/><span class="value">{{ $ctrl.NP04_PT0104AI[0].Mnish - $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span><br/>Inner pressure:<br/><span class="value">{{ $ctrl.NP04_PT0100AI[0].Mnish - $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span><br/>Inner pressure 2:<br/><span class="value">{{ $ctrl.NP04_PT0102AI[0].Mnish - $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></div>
<div id="beam_plug">Beam plug:<br/><a target="_blank" href="#!/histogram/NP04_2PT0100AIR"><span class="value">{{ $ctrl.NP04_2PT0100AIR[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="lesker_vacuum_gauge">Lesker vacuum gauge:<br/><a target="_blank" href="#!/histogram/NP04_2TT0100AIR"><span class="value">{{ $ctrl.NP04_2PT0100AI[0].Mnish | number: 1 }} V</span></a></div>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="inner_pressure_2">Inner Pressure ABS 2:<br/><a target="_blank" href="#!/histogram/NP04_PT0102AI"><span class="value">{{ $ctrl.NP04_PT0102AI[0].Mnish | number: 1 }} mbar</span></a><br/>Inner Pressure Diff 2:<br/><a target="_blank" href="#!/histogram/NP04_PT0103AI"><span class="value">{{ $ctrl.NP04_PT0103AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="inner_pressure_2">Inner Pressure ABS 2 (PT0102):<br/><a target="_blank" href="#!/histogram/NP04_PT0102AI"><span class="value">{{ $ctrl.NP04_PT0102AI[0].Mnish | number: 1 }} mbar</span></a><br/>Inner Pressure Diff 2 (PT0103):<br/><a target="_blank" href="#!/histogram/NP04_PT0103AI"><span class="value">{{ $ctrl.NP04_PT0103AI[0].Mnish | number: 1 }} mbar</span></a></div>
<div id="penetration_pipe">
<table id="penetration">
<tr>
......
app/css/bottom.css
+ 18
− 0
View file @ 7fd80154
......@@ -91,6 +91,12 @@
top: 40vw;
left: 53vw;
}
#old {
position: absolute;
top: 10vw;
left: 35vw;
}
}
@media screen and (min-height: 1100px) {
......@@ -186,6 +192,12 @@
top: 95vh;
left: 21vw;
}
#old {
position: absolute;
top: 10vw;
left: 35vw;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -281,4 +293,10 @@
top: 40vw;
left: 53vw;
}
#old {
position: absolute;
top: 10vw;
left: 35vw;
}
}
\ No newline at end of file
app/css/east.css
+ 18
− 0
View file @ 7fd80154
......@@ -40,6 +40,12 @@
top: 42vw;
left: 61vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) {
......@@ -84,6 +90,12 @@
top: 57vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -128,4 +140,10 @@
top: 80.3vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
\ No newline at end of file
app/css/north.css
+ 18
− 0
View file @ 7fd80154
......@@ -40,6 +40,12 @@
top: 42vw;
left: 61vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) {
......@@ -84,6 +90,12 @@
top: 57vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -128,4 +140,10 @@
top: 80.3vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
\ No newline at end of file
app/css/south.css
+ 18
− 0
View file @ 7fd80154
......@@ -40,6 +40,12 @@
top: 42vw;
left: 61vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) {
......@@ -84,6 +90,12 @@
top: 57vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -128,4 +140,10 @@
top: 80.3vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
\ No newline at end of file
app/css/west.css
+ 18
− 0
View file @ 7fd80154
......@@ -40,6 +40,12 @@
top: 42vw;
left: 61vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) {
......@@ -84,6 +90,12 @@
top: 57vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
@media screen and (min-height: 1100px) and (min-width: 3000px) {
......@@ -128,4 +140,10 @@
top: 80.3vh;
left: 66vw;
}
#old {
position: absolute;
top: 30vw;
right: 15vw;
}
}
\ No newline at end of file
app/east/east.template.html
+ 1
− 0
View file @ 7fd80154
......@@ -2,6 +2,7 @@
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001abbb.png" alt="TSS 001 AB/BB"/>
<img id="old" src="img/east.png" alt="East old"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
......
app/img/bottom.png 0 → 100644
+ 0
− 0
View file @ 7fd80154
app/img/bottom.png

17.1 KiB

app/img/east.png 0 → 100644
+ 0
− 0
View file @ 7fd80154
app/img/east.png

13 KiB

app/img/north.png 0 → 100644
+ 0
− 0
View file @ 7fd80154
app/img/north.png

12.6 KiB

app/img/south.png 0 → 100644
+ 0
− 0
View file @ 7fd80154
app/img/south.png

11.9 KiB

app/img/west.png 0 → 100644
+ 0
− 0
View file @ 7fd80154
app/img/west.png

12.8 KiB

app/north/north.template.html
+ 1
− 0
View file @ 7fd80154
......@@ -2,6 +2,7 @@
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001abbb.png" alt="TSS 001 AB/BB"/>
<img id="old" src="img/north.png" alt="North old"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
......
app/south/south.template.html
+ 1
− 0
View file @ 7fd80154
......@@ -2,6 +2,7 @@
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
<img id="old" src="img/south.png" alt="South old"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
......
app/tinternal/tinternal.component.js
+ 316
− 3
View file @ 7fd80154
This diff is collapsed.
app/west/west.template.html
+ 1
− 0
View file @ 7fd80154
......@@ -2,6 +2,7 @@
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
<img id="old" src="img/west.png" alt="West old"/>
<div id="timestamp_label">Timestamp:<br/><span id="timestamp">{{ $ctrl.timestamp[0].Mnish }}</span></div>
<div id="ambient">Humidity:<br/><a target="_blank" href="#!/histogram/NP04_MHT0100AI"><span class="value">{{ $ctrl.NP04_MHT0100AI[0].Mnish | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_TT0100AI"><span class="value">{{ $ctrl.NP04_TT0100AI[0].Mnish | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_PT0106AI"><span class="value">{{ $ctrl.NP04_PT0106AI[0].Mnish | number: 1 }} mbar</span></a></div>
......
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