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

Improved grid layout

Browse source 
S1's properties are clickable and drawn in the plot.
This commit is contained in:
Markus Grigull 2015-10-13 16:02:28 +02:00
parent 806de033d4
commit 8ecc8ba95d
5 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/line-chart.js
View file

@ -31,7 +31,7 @@ export default Ember.Component.extend({
var lastTimestamp = this.data[this.data.length - 1][0];
var diff = lastTimestamp - firstTimestamp;
var diffValue = this.xaxisLength * 100;
var diffValue = this.xaxisLength * 1000;
if (diff > diffValue) {
firstTimestamp = lastTimestamp - diffValue;

2
app/routes/lab-mashup.js
View file

@ -28,7 +28,7 @@ export default Ember.Route.extend({
// fetch new data from server
this.store.query('entity', { entities: [
{
id: 'S3_ElectricalGrid',
id: 'S1_ElectricalGrid',
isPattern: false,
type: 'ElectricalGridMonitoring'
},

15
app/styles/app.css
View file

@ -64,6 +64,8 @@ h2 {
margin: 0;
border: 0;
border-collapse: collapse;
}
.grid2x2 td {
@ -79,11 +81,22 @@ h2 {
}
#S1-left {
width: 200px;
width: 150px;
}
#S1-right {
width: auto;
padding: 25px;
padding-bottom: 30px;
}
#S1-right h3 {
text-align: center;
}
#S1-right h4 {
text-align: right;
}
#S2-left {

2
app/templates/components/property-table.hbs
View file

@ -3,6 +3,6 @@
</tr>
{{#each model.properties as |property|}}
<tr>
<td {{action "propertyClicked" property}}>{{property.name}}</td>
<td><a href="#" {{action "propertyClicked" property}}>{{property.name}}</a></td>
</tr>
{{/each}}

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

@ -16,7 +16,9 @@
</td>
<td id="S1-right">
{{line-chart data=S1Property.values dataName=S1Property.name}}
<h3>{{S1Property.name}}</h3>
{{line-chart data=S1Property.values}}
<h4>{{S1Property.type}}</h4>
</td>
</tr>
</table>
@ -33,7 +35,7 @@
{{property-table model=S2Entity showProperty="showPropertyValues"}}
</td>
<td id="S2-right">
{{line-chart data=S2Property.values dataName=S2Property.name}}
{{line-chart data=S2Property.values}}
</td>
</tr>
</table>