Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Add latest changes

Browse source
This commit is contained in:
Markus Grigull 2015-10-27 07:09:22 -04:00
parent c4dc0c6e76
commit f3ac48c149
6 changed files with 24901 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/lab-mashup.js
View file

@ -48,7 +48,12 @@ export default Ember.Controller.extend({
}
}
if (control.get('Status') === 'EOF' && control.get('ForceReload') === false) {
var status = control.get('Status');
var reload = control.get('ForceReload');
/*Ember.debug('status: ' + status + ', reload: ' + reload);*/
if ((status === 'EOF') && ((reload === false) || (reload) === 'false')) {
if (this.get('state') === 1) {
control.set('ForceReload', true);
} else {
@ -130,8 +135,7 @@ export default Ember.Controller.extend({
this.set('totalPValue', [
{
bars: { show: true },
data: [[0, attr_totalP.get('currentValue')]],
label: 'Total DS absorb [MW]'
data: [[0, attr_totalP.get('currentValue')]]
}
]);
} else {

12
app/styles/app.css
View file

@ -108,7 +108,7 @@ footer {
}
.svg-image {
width: 50%;
width: 60%;
height: auto;
}
@ -166,7 +166,7 @@ p {
}
.gauge {
padding-top: 20px;
margin-top: -20px;
padding-left: 20px;
float: left;
@ -174,8 +174,8 @@ p {
.alarm {
float: right;
padding-top: 20px;
padding-right: 80px;
/*padding-top: 20px;*/
padding-right: 60px;
}
button {
@ -269,7 +269,6 @@ overflow: hidden;
.layout-page h2 {
text-align: center;
font-size: 1em;
margin: 0;
}
@ -305,9 +304,8 @@ overflow: hidden;
}
.page-grid h2 {
font-size: 1.4em;
padding-top: 35px;
padding-top: 5px;
}
.page-grid h3 {

3
app/templates/application.hbs
View file

@ -6,7 +6,8 @@
<div id="logos">
<img src={{"assets/images/EU.svg"}} class="svg-logo" />
<img src={{"assets/images/RWTH.svg"}} class="svg-logo" id="rwth-logo" />
<img src={{"assets/images/PoliTo.svg"}} class="svg-logo" />
<img src={{"assets/images/Logo3_Polito.svg"}} class="svg-logo" />
<img src={{"assets/images/flexmeter_logo.svg"}} class="svg-logo" />
</div>
</header>

29
app/templates/lab-mashup.hbs
View file

@ -38,11 +38,11 @@
<li>Electric power capacity: 8458 MW</li>
</ul>
</p>
<div style="padding-top: 40px;">
<div style="padding-top: 60px; padding-left: 20px;">
{{d3-alarm value=freq575Value alarmZones=freq575AlarmZones size=35}}
{{d3-gauge label="Freq" value=freq575Value minValue=49 maxValue=51 minorTicks=4 size=120 greenZones=freq575GreenZones yellowZones=freq575YellowZones}}
</div>
<div style="width: 100%; margin-top: 150px">
<div style="width: 100%; margin-top: 150px; padding-left: 10px;">
<h3 style="padding-left: 10px">
Frequency measurement<br />
at STURA substation
@ -56,17 +56,17 @@
<td style="padding-top: 5px;">
<div class="layout-page">
<table class="page-grid">
<tr style="height: 25%">
<tr style="height: 15%">
<td style="width: 25%">
</td>
<td style="width: 50%" colspan="2">
<h2>Control Center</h2>
</td>
<td style="width: 25%">
<img src={{"assets/images/ControlCenter_section/CS_fig1.svg"}} class="svg-image" style="float: right; width: 40% !important" />
<img src={{"assets/images/ControlCenter_section/CS_fig1.svg"}} class="svg-image" style="float: right; width: 50% !important" />
</td>
</tr>
<tr style="height: 75%">
<tr style="height: 85%">
<td style="width: 50%" colspan="2">
<h3 style="text-align: center">
Distribution grid monitoring voltage measurement
@ -81,7 +81,7 @@
<div style="position: relative; top: 30%; left: 30%">
<button {{action 'eventData'}} disabled={{eventButtonState}} id="event-button">ABNORMAL<br />cloudy + high demand</button>
</div>
<div style="position: relative; top: 48%; left: 76%">
<div style="position: relative; top: 48%; left: 72%">
<a class="link-button" href="/technical/" target="_blank">Technical</a>
</div>
</td>
@ -113,14 +113,17 @@
</tr>
<tr>
<td colspan="2">
<p style="padding-top: 25px; padding-bottom: 30px">
<p style="padding-top: 25px; padding-bottom: 20px">
Turin - Piedmont - Italy<br />
<ul>
<li>Medium Voltage lines derived from Stura HV/MV</li>
<li>Total length of lines: 38,54 km</li>
</ul>
</p>
{{bar-chart data=totalPValue width='200px' height='250px' maxValue=25}}
{{bar-chart data=totalPValue width='200px' height='250px' maxValue=30}}
<h3 style="padding-left: 15px;">
Total Net Consumption [MW]
</h3>
</td>
</tr>
</table>
@ -130,17 +133,17 @@
<td style="padding-bottom: 5px;">
<div class="layout-page">
<table class="page-grid">
<tr style="height: 25%">
<tr style="height: 15%">
<td style="width: 25%">
</td>
<td style="width: 50%" colspan="2">
<h2>Prosumer behavior</h2>
</td>
<td style="width: 25%">
<img src={{"assets/images/Prosumer_section/Cnsmr_fig1.svg"}} class="svg-image" style="float: right; width: 40%;" />
<img src={{"assets/images/Prosumer_section/Cnsmr_fig1.svg"}} class="svg-image" style="float: right; width: 50% !important;" />
</td>
</tr>
<tr style="height: 75%">
<tr style="height: 85%">
<td style="width: 50%; padding-left: 0px" colspan="2">
<h3 style="text-align: center">
Prosumer: Consumption and generation profiles
@ -150,10 +153,10 @@
</td>
<td style="width: 50%;" colspan="2">
{{#if initState}}
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" class="shadowed" />
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px; margin-top: 40px;" class="shadowed" />
{{/if}}
{{#if eventState}}
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" class="shadowed" />
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px; margin-top: 40px;" class="shadowed" />
{{/if}}
</td>
</tr>

12420
public/assets/images/DS_section/DS_fig1.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 952 KiB

12468
public/assets/images/Logo3_Polito.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 934 KiB