Skip to content
GitLab
Commit c0c10536 authored by Patrick's avatar Patrick
Browse files

update noise

parent 0a7469cd
Show whitespace changes
Inline Side-by-side
vcm/css/menu.css
View file @ c0c10536
...@@ -238,6 +238,18 @@ ...@@ -238,6 +238,18 @@
color: white; color: white;
/* height: 350px; Should be removed. Only for demonstration */ /* height: 350px; Should be removed. Only for demonstration */
} }
.column2 {
width: 33.33%;
padding: 10px;
position: relative;
color: black;
height: 30px; /*Should be removed. Only for demonstration */
float:left !important;
margin-left: 20px;
position:absolute;
}
.top-left { .top-left {
position: absolute; position: absolute;
top: 8px; top: 8px;
...@@ -274,3 +286,9 @@ ...@@ -274,3 +286,9 @@
display: table; display: table;
clear: both; clear: both;
} }
.row2:after {
content: "";
display: table;
clear: both;
width: 100%;
}
\ No newline at end of file
vcm/index.html
View file @ c0c10536
...@@ -535,15 +535,15 @@ ...@@ -535,15 +535,15 @@
<a class="contentOne"><strong>Noise Sensors (historisch):</strong></a><br> <a class="contentOne"><strong>Noise Sensors (historisch):</strong></a><br>
<button id ="btn_NoiseSensOpen" onclick="NoiseText(false);">Open</button><br> <button id ="btn_NoiseSensOpen" onclick="NoiseText(false);">Open</button><br>
<h2>Lärmsensoren aus dem Luftdaten.info Projekt</h2><br> <h2>Lärmsensoren aus dem Luftdaten.info Projekt</h2><br>
<div id="loadingHistNoise"></div> <div class="row2" id="loadingHistNoise"></div>
<label for="cars">Sensor wählen:</label> <label class="column2" style="position:relative;padding-left:0px; padding-top:10px; padding-bottom:10px;margin-left:0px;" >Sensor wählen:</label>
<select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);" name="sensor" id="sensors"> <select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);margin-left:20px;" name="sensor" id="sensors">
<option value="49368">49368</option> <option value="49368">49368</option>
<option value="53627">53627</option> <option value="53627">53627</option>
<option value="29212">29212</option> <option value="29212">29212</option>
<option value="compLAeq">compare LAeq</option> <option value="compLAeq">compare LAeq</option>
</select> </select>
<a class="contentOne" href="#" id ="btn_NoiseSensShow" style="width:6em !important; height:2em !important;border-radius: 3px; padding-top: 1em;padding-bottom: 2em;" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('49368')">anzeigen</a> <a class="contentOne column2" href="#" id ="btn_NoiseSensShow" style="width:6em !important; height:2em !important;border-radius: 3px; padding-top: 0.7em;padding-bottom: 2.3em;" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('Exp','49368')">anzeigen</a>
<!-- <div class="dropdown"> <!-- <div class="dropdown">
<button class="dropbtn">Sensor wählen:</button> <button class="dropbtn">Sensor wählen:</button>
<div class="dropdown-content"> <div class="dropdown-content">
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
<div id="unconstrained"></div><br> <div id="unconstrained"></div><br>
<span class="example-val" id="unconstrained-values"></span> <span class="example-val" id="unconstrained-values"></span>
<a class="contentOne">Überblick Sensor</a> <a class="contentOne">Überblick Sensor</a>
<div style='width:100%;margin-top:10px;' id="chartNoise"></div> <div id="chartNoiseExp"><div style='width:100%;margin-top:10px;' id="chartNoise"></div></div>
<a class="contentOne">Genauere Sensordaten (LAeq)</a> <a class="contentOne">Genauere Sensordaten (LAeq)</a>
<div style='width:100%;margin-top:10px;' id="chartNoiseSTA"></div> <div style='width:100%;margin-top:10px;' id="chartNoiseSTA"></div>
<!-- <div id="slider-color"></div> --> <!-- <div id="slider-color"></div> -->
...@@ -929,15 +929,15 @@ ...@@ -929,15 +929,15 @@
<button id ="btn_RailNight" onclick="noisemap2('night')">Night</button> <button id ="btn_RailNight" onclick="noisemap2('night')">Night</button>
<button id ="btn_RailOff" onclick="noisemap2('off')">Off</button><br><br> <button id ="btn_RailOff" onclick="noisemap2('off')">Off</button><br><br>
<h3>Lärmsensoren aus dem Luftdaten.info Projekt</h3><br> <h3>Lärmsensoren aus dem Luftdaten.info Projekt</h3><br>
<div id="loadingHistNoise"></div> <div class="row2" id="loadingHistNoise"></div>
<label for="cars">Sensor wählen:</label> <label class="column2" style="position:relative;padding-left:0px; padding-top:10px; padding-bottom:10px;margin-left:0px;">Sensor wählen:</label>
<select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);" name="sensor" id="sensors"> <select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);margin-left:20px;" name="sensor" id="sensors">
<option value="49368">49368</option> <option value="49368">49368</option>
<option value="53627">53627</option> <option value="53627">53627</option>
<option value="29212">29212</option> <option value="29212">29212</option>
<option value="compLAeq">compare LAeq</option> <option value="compLAeq">compare LAeq</option>
</select> </select>
<a class="contentOne" href="#" id ="btn_NoiseSensShow" style="width:6em !important; height:2em !important;border-radius: 3px; padding-top: 1em;padding-bottom: 2em;" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('49368')">anzeigen</a> <a class="contentOne column2" href="#" id ="btn_NoiseSensShow" style="width:6em !important; height:2em !important;border-radius: 3px; padding-top: 0.7em;padding-bottom: 2.3em;" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('Main','49368')">anzeigen</a>
<!-- <div class="dropdown"> <!-- <div class="dropdown">
<button class="dropbtn">Sensor wählen:</button> <button class="dropbtn">Sensor wählen:</button>
<div class="dropdown-content"> <div class="dropdown-content">
...@@ -952,7 +952,8 @@ ...@@ -952,7 +952,8 @@
<div id="unconstrained"></div><br> <div id="unconstrained"></div><br>
<span class="example-val" id="unconstrained-values"></span> <span class="example-val" id="unconstrained-values"></span>
<a class="contentOne">Überblick Sensor</a> <a class="contentOne">Überblick Sensor</a>
<div style='width:100%;margin-top:10px;' id="chartNoise"></div> <div id="chartNoiseMain">
<div style='width:100%;margin-top:10px;' id="chartNoise"></div></div>
<a class="contentOne">Genauere Sensordaten (LAeq)</a> <a class="contentOne">Genauere Sensordaten (LAeq)</a>
<div style='width:100%;margin-top:10px;' id="chartNoiseSTA"></div> <div style='width:100%;margin-top:10px;' id="chartNoiseSTA"></div>
<!-- <div id="slider-color"></div> --> <!-- <div id="slider-color"></div> -->
......
vcm/js/noise.js
View file @ c0c10536
...@@ -419,9 +419,15 @@ function noisesens(status){ ...@@ -419,9 +419,15 @@ function noisesens(status){
} }
let histNoise let histNoise
function HistNoiseData(Sensor) { function HistNoiseData(where, Sensor) {
if (where == "Main"){
document.getElementById("chartNoiseMain").innerHTML = "<div style='width:100%;margin-top:10px;' id='chartNoise'></div>";
document.getElementById("chartNoiseExp").innerHTML = "";
} else if(where == "Exp"){
document.getElementById("chartNoiseExp").innerHTML = "<div style='width:100%;margin-top:10px;' id='chartNoise'></div>";
document.getElementById("chartNoiseMain").innerHTML = "";
}
try { try {
......
vcm/templates/story/story.css
View file @ c0c10536
...@@ -100,12 +100,13 @@ div.title-fill { ...@@ -100,12 +100,13 @@ div.title-fill {
.top-nav{ .top-nav{
display: inline-block; display: inline-block;
color: white; color: white;
font-weight: bold; font-weight: 600;
padding: 4px; padding: 4px;
margin-bottom: 4px; margin-bottom: 4px;
border-radius: 2px; border-radius: 2px;
font-size: .9rem; font-size: 1rem;
text-decoration: none; text-decoration: none;
font-family: 'Roboto', sans-serif;
} }
#story-frame{ #story-frame{
......
Supports Markdown
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal