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

v 0.97.3

- Small fixes and changes
TODO:
parent 063a6620
No related branches found
No related tags found
No related merge requests found
Showing
with 111 additions and 175 deletions
<link rel="stylesheet" href="css/bottom.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/bottom1.png" alt="Bottom1"/>
<img id="second" src="img/bottom2.png" alt=""/>
<img id="tss001AABA" src="img/tss-001-aaba.PNG" alt="Bottom1"/>
<img id="tss002ABBB" src="img/tss-002-abbb.PNG" alt=""/>
<img id="tss002ACBC" src="img/tss-002-abbb.PNG" alt=""/>
<img id="tss002AEBE" src="img/tss-002-abbb.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_DCS_V21-CPC_AnalogInput-00007.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_MHT0100AI | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00008.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_TT0100AI | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00009.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_PT0106AI | number: 1 }} mbar</span></a></div>
<div id="tss001AABA">TSS 001 AA/BA</div>
<div id="tss002AABA">TSS 002 AA/BA</div>
<div id="tss002ADBD">TSS 002 AD/BD</div>
<div id="tss002AEBE">TSS 002 AE/BE</div>
<div id="NP04_7TT0200AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0121"><span class="value">{{ $ctrl.NP04_DCS_01_TE0121 | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0202AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0123"><span class="value">{{ $ctrl.NP04_DCS_01_TE0123 | number: 2 }} &#8490;</span></a></div>
<div id="NP04_7TT0214AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0135"><span class="value">{{ $ctrl.NP04_DCS_01_TE0135 | number: 2 }} &#8490;</span></a></div>
......
......@@ -8,20 +8,6 @@
margin: 0;
}
#detector {
position: fixed;
top: 25vh;
left: 2vw;
width: 40%;
}
#second {
position: fixed;
top: 25vh;
left: 47vw;
width: 40%;
}
#ambient {
position: absolute;
right: 5vw;
......@@ -33,45 +19,37 @@
}
#tss001AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 15vw;
position: fixed;
top: 15vh;
left: 2vw;
width: 30vw;
}
#tss002AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 30vw;
#tss002ABBB {
position: fixed;
top: 15vh;
left: 55vw;
width: 30vw;
}
#tss002ADBD {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 75vw;
#tss002ACBC {
position: fixed;
top: 55vh;
left: 2vw;
width: 30vw;
}
#tss002AEBE {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 50vw;
position: fixed;
top: 55vh;
left: 55vw;
width: 30vw;
}
#NP04_7TT0200AIR {
position: absolute;
top: 40vw;
left: 17vw;
top: 20vw;
left: 33vw;
}
#NP04_7TT0202AIR {
......@@ -82,14 +60,14 @@
#NP04_7TT0214AIR {
position: absolute;
top: 40vw;
left: 77vw;
top: 20vw;
left: 87vw;
}
#NP04_7TT0219AIR {
position: absolute;
top: 40vw;
left: 53vw;
left: 87vw;
}
#old {
......@@ -109,20 +87,6 @@
margin: 0;
}
#detector {
position: fixed;
top: 20vh;
left: 15vw;
width: 60%;
}
#second {
position: fixed;
top: 60vh;
left: 15vw;
width: 60%;
}
#ambient {
position: absolute;
right: 5vw;
......@@ -134,63 +98,55 @@
}
#tss001AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.0vmin;
top: 54vh;
left: 37vw;
position: fixed;
top: 15vh;
left: 2vw;
width: 30vw;
}
#tss002AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.0vmin;
top: 54vh;
left: 57vw;
#tss002ABBB {
position: fixed;
top: 15vh;
left: 55vw;
width: 30vw;
}
#tss002ADBD {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.0vmin;
top: 93vh;
left: 59vw;
#tss002ACBC {
position: fixed;
top: 55vh;
left: 2vw;
width: 30vw;
}
#tss002AEBE {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.0vmin;
top: 93vh;
left: 19vw;
position: fixed;
top: 55vh;
left: 55vw;
width: 30vw;
}
#NP04_7TT0200AIR {
position: absolute;
top: 56vh;
left: 39vw;
top: 20vw;
left: 33vw;
}
#NP04_7TT0202AIR {
position: absolute;
top: 56vh;
left: 59vw;
top: 40vw;
left: 33vw;
}
#NP04_7TT0214AIR {
position: absolute;
top: 95vh;
left: 61vw;
top: 20vw;
left: 87vw;
}
#NP04_7TT0219AIR {
position: absolute;
top: 95vh;
left: 21vw;
top: 40vw;
left: 87vw;
}
#old {
......@@ -210,20 +166,6 @@
margin: 0;
}
#detector {
position: fixed;
top: 25vh;
left: 2vw;
width: 40%;
}
#second {
position: fixed;
top: 25vh;
left: 47vw;
width: 40%;
}
#ambient {
position: absolute;
right: 5vw;
......@@ -235,45 +177,37 @@
}
#tss001AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 15vw;
position: fixed;
top: 15vh;
left: 2vw;
width: 30vw;
}
#tss002AABA {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 30vw;
#tss002ABBB {
position: fixed;
top: 15vh;
left: 55vw;
width: 30vw;
}
#tss002ADBD {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 75vw;
#tss002ACBC {
position: fixed;
top: 55vh;
left: 2vw;
width: 30vw;
}
#tss002AEBE {
position: absolute;
color: gray;
font-family: "Arial Black", Gadget, sans-serif;
font-size: 2.3vmin;
top: 42vw;
left: 50vw;
position: fixed;
top: 55vh;
left: 55vw;
width: 30vw;
}
#NP04_7TT0200AIR {
position: absolute;
top: 40vw;
left: 17vw;
top: 20vw;
left: 33vw;
}
#NP04_7TT0202AIR {
......@@ -284,14 +218,14 @@
#NP04_7TT0214AIR {
position: absolute;
top: 40vw;
left: 77vw;
top: 20vw;
left: 87vw;
}
#NP04_7TT0219AIR {
position: absolute;
top: 40vw;
left: 53vw;
left: 87vw;
}
#old {
......
......@@ -13,7 +13,7 @@
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -61,9 +61,9 @@
#detector {
display: block;
position: fixed;
top: 35vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -111,9 +111,9 @@
#detector {
display: block;
position: fixed;
top: 30vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......
......@@ -13,7 +13,7 @@
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -61,9 +61,9 @@
#detector {
display: block;
position: fixed;
top: 35vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -111,9 +111,9 @@
#detector {
display: block;
position: fixed;
top: 30vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......
......@@ -13,7 +13,7 @@
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -61,9 +61,9 @@
#detector {
display: block;
position: fixed;
top: 35vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -111,9 +111,9 @@
#detector {
display: block;
position: fixed;
top: 30vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......
......@@ -13,7 +13,7 @@
position: fixed;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -61,9 +61,9 @@
#detector {
display: block;
position: fixed;
top: 35vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......@@ -111,9 +111,9 @@
#detector {
display: block;
position: fixed;
top: 30vh;
top: 25vh;
left: 12vw;
width: 65%;
width: 50vw;
}
#ambient {
......
<link rel="stylesheet" href="css/east.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001abbb.png" alt="TSS 001 AB/BB"/>
<img id="detector" src="img/east.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_DCS_V21-CPC_AnalogInput-00007.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_MHT0100AI | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00008.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_TT0100AI | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00009.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_PT0106AI | number: 1 }} mbar</span></a></div>
<div id="tss001ADBD">TSS 001 AD/BD</div>
<div id="NP04_7TT0206AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0127"><span class="value">{{ $ctrl.NP04_DCS_01_TE0127 | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
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

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

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/tss-001-aaba.PNG

210 KiB

app/img/tss-002-abbb.PNG

183 KiB

app/img/tss-002-acbc.PNG

183 KiB

app/img/tss-002-aebe.PNG

207 KiB

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
<link rel="stylesheet" href="css/north.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001abbb.png" alt="TSS 001 AB/BB"/>
<img id="detector" src="img/north.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_DCS_V21-CPC_AnalogInput-00007.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_MHT0100AI | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00008.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_TT0100AI | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00009.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_PT0106AI | number: 1 }} mbar</span></a></div>
<div id="tss001ABBB">TSS 001 AB/BB</div>
<div id="NP04_7TT0201AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0122"><span class="value">{{ $ctrl.NP04_DCS_01_TE0122 | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
......@@ -21,8 +21,11 @@ if (!$conn) {
trigger_error(htmlentities($e['message'], ENT_QUOTES), E_USER_ERROR);
}
$stid = oci_parse($conn, "select substr(extract(day from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 24 * 60 * 60 + extract(hour from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 * 60 + extract(minute from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 + trunc(extract(second from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')),0),0,15)*1000 as TS, VALUE_NUMBER from (select * from NP04_DCS_01.VEVENTSCREEN order by TS asc) where ELEMENT_NAME like '%".$elemId."%' and TS >= sysdate - ".$days."and VALUE_NUMBER between 0 and 1500");
if (strpos($elemId, 'NP04_DCS_01_TE') !== FALSE) {
$stid = oci_parse($conn, "select substr(extract(day from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 24 * 60 * 60 + extract(hour from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 * 60 + extract(minute from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 + trunc(extract(second from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')),0),0,15)*1000 as TS, VALUE_NUMBER from (select * from NP04_DCS_01.VEVENTSCREEN order by TS asc) where ELEMENT_NAME like '%".$elemId."%' and TS >= sysdate - ".$days."and VALUE_NUMBER between 1 and 1000");
} else {
$stid = oci_parse($conn, "select substr(extract(day from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 24 * 60 * 60 + extract(hour from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 * 60 + extract(minute from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')) * 60 + trunc(extract(second from (TS - TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC')),0),0,15)*1000 as TS, VALUE_NUMBER from (select * from NP04_DCS_01.VEVENTSCREEN order by TS asc) where ELEMENT_NAME like '%".$elemId."%' and TS >= sysdate - ".$days."and VALUE_NUMBER between 0 and 1500");
}
oci_execute($stid);
......
......@@ -18,7 +18,7 @@
}
$sql = "SELECT TS, VALUE_NUMBER FROM gauges WHERE ELEMENT_NAME='".$elemId."' AND (TS > UNIX_TIMESTAMP() * 1000 - ".$days.") AND (TS <= UNIX_TIMESTAMP() * 1000) ORDER BY TS asc";
$sql = "SELECT TS, VALUE_NUMBER FROM gauges_new WHERE ELEMENT_NAME='".$elemId."' AND (TS > UNIX_TIMESTAMP() * 1000 - ".$days.") AND (TS <= UNIX_TIMESTAMP() * 1000) ORDER BY TS asc";
$result = $conn->query($sql);
if (!$result) {
throw new Exception("Database Error [{$this->database->errno}] {$this->database->error}");
......
<link rel="stylesheet" href="css/south.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
<img id="detector" src="img/south.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_DCS_V21-CPC_AnalogInput-00007.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_MHT0100AI | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00008.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_TT0100AI | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00009.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_PT0106AI | number: 1 }} mbar</span></a></div>
<div id="tss001ACBC">TSS 001 AC/BC</div>
<div id="NP04_7TT0212AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0133"><span class="value">{{ $ctrl.NP04_DCS_01_TE0133 | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
<link rel="stylesheet" href="css/west.css">
<div class="container">
<div id="pageTitle">{{$ctrl.pageTitle}}</div>
<img id="detector" src="img/tss001acbc.png" alt="TSS 001 AB/BB"/>
<img id="detector" src="img/west.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_DCS_V21-CPC_AnalogInput-00007.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_MHT0100AI | number: 1 }} %</span></a><br/>Ambient temperature:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00008.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_TT0100AI | number: 1 }} &#8451;</span></a><br/>Ambient pressure:<br/><a target="_blank" href="#!/histogram/NP04_DCS_V21-CPC_AnalogInput-00009.ProcessInput.PosSt"><span class="value">{{ $ctrl.NP04_PT0106AI | number: 1 }} mbar</span></a></div>
<div id="tss001AEBE">TSS 001 AE/BE</div>
<div id="NP04_7TT0218AIR"><a target="_blank" href="#!/histogram/NP04_DCS_01_TE0139"><span class="value">{{ $ctrl.NP04_DCS_01_TE0139 | number: 2 }} &#8490;</span></a></div>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment