diff --git a/app/components/line-chart.js b/app/components/line-chart.js index de62be7..3966339 100644 --- a/app/components/line-chart.js +++ b/app/components/line-chart.js @@ -33,7 +33,7 @@ export default Ember.Component.extend({ _drawPlot: function() { var element = this.get('element'); if (element && element.id) { - if (this.data) { + if (this.data && this.data.get('values')) { var values = this.data.get('values'); if (values.length > 0) { diff --git a/app/controllers/lab-mashup.js b/app/controllers/lab-mashup.js index 16385a1..cb6c094 100644 --- a/app/controllers/lab-mashup.js +++ b/app/controllers/lab-mashup.js @@ -1,6 +1,8 @@ import Ember from 'ember'; export default Ember.Controller.extend({ + state: 1, + dataSetOne: [ { label: 'Total consumption [MW]', @@ -52,10 +54,12 @@ export default Ember.Controller.extend({ } }.property('model.[]'), - S2Voltage203937: function() { - var entity = this.model.findBy('id', 'S2_ElectricalGrid'); + Voltage203937: function() { + var entity = this.model.findBy('id', 'S1_ElectricalGrid'); if (entity) { return entity.get('properties').findBy('name', 'Voltage203937'); + } else { + return {}; } }.property('model.[]'), @@ -66,12 +70,22 @@ export default Ember.Controller.extend({ } }.property('model.[]'), + initState: function() { + return this.get('state') === 1; + }.property('state'), + + eventState: function() { + return this.get('state') === 2; + }.property('state'), + actions: { resetData: function() { + this.set('state', 1); this.set('dataSet', this.get('dataSetOne')); }, eventData: function() { + this.set('state', 2); this.set('dataSet', this.get('dataSetTwo')); } } diff --git a/app/styles/app.css b/app/styles/app.css index 2b8519e..8dcc2dd 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -75,7 +75,7 @@ header #title { -webkit-text-rendering: optimizeLegiblity; -moz-text-rendering: optimizeLegibitliy; - padding: 15px 0 15px 30px; + padding: 10px 0 20px 30px; float: left; } @@ -127,6 +127,16 @@ footer { height: 40px !important; } +#DS-image { + width: auto; + height: 300px; +} + +#TS-image { + width: auto; + height: 350px; +} + h1 { font-size: 1.4em; @@ -168,11 +178,19 @@ p { border: 0; border-collapse: collapse; + + table-layout: fixed; +overflow: hidden; } .grid td { + width: 50%; + height: 50%; + /*padding: 20px 10px 20px 10px;*/ padding: 10px; + + vertical-align: top; } .layout-page { @@ -180,8 +198,8 @@ p { box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 9px 18px 0 rgba(0, 0, 0, 0.1); - width: 99%; - height: 99%; + width: 100%; + height: 100%; padding: 20px; @@ -208,6 +226,8 @@ p { padding: 0; margin: 0; + + table-layout: fixed; } .page-grid tr { @@ -218,6 +238,20 @@ p { .page-grid td { padding: 0; margin: 0; + + width: auto; + height: auto; +} + +.page-grid h2 { + font-size: 1.4em; + + padding-top: 35px; +} + +.page-grid h3 { + padding: 0; + margin: 0; } /* diff --git a/app/templates/application.hbs b/app/templates/application.hbs index da9bfe8..85e59be 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,9 +1,9 @@
- Multi-Site Real-Time Co-Simulation Integrated Lab + ERIC Lab
- Control Center – JRC Ispra + European Real-Time Integrated Co-Simulation Lab
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs index b54f12d..9e40699 100644 --- a/app/templates/lab-mashup.hbs +++ b/app/templates/lab-mashup.hbs @@ -1,25 +1,122 @@
- - + - - - + - diff --git a/public/assets/images/ControlCenter_section/CS_fig1.svg b/public/assets/images/ControlCenter_section/CS_fig1.svg new file mode 100644 index 0000000..cc835ee --- /dev/null +++ b/public/assets/images/ControlCenter_section/CS_fig1.svg @@ -0,0 +1,668 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JRC Ispra + + + diff --git a/public/assets/images/DS_section/DS_fig1.svg b/public/assets/images/DS_section/DS_fig1.svg new file mode 100644 index 0000000..7dfc1c0 --- /dev/null +++ b/public/assets/images/DS_section/DS_fig1.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + PoliTo + + + + + + + + + + + + + + + diff --git a/public/assets/images/DS_section/DSmap_m1.gif b/public/assets/images/DS_section/DSmap_m1.gif new file mode 100644 index 0000000..0ab0588 Binary files /dev/null and b/public/assets/images/DS_section/DSmap_m1.gif differ diff --git a/public/assets/images/DS_section/DSmap_m2.gif b/public/assets/images/DS_section/DSmap_m2.gif new file mode 100644 index 0000000..4f48b2c Binary files /dev/null and b/public/assets/images/DS_section/DSmap_m2.gif differ diff --git a/public/assets/images/Prosumer_section/Cnsmr_fig1.svg b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg new file mode 100644 index 0000000..38ba6ef --- /dev/null +++ b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg @@ -0,0 +1,654 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JRC Petten + + + + diff --git a/public/assets/images/Prosumer_section/Cnsmr_fig2.svg b/public/assets/images/Prosumer_section/Cnsmr_fig2.svg new file mode 100644 index 0000000..7b334f9 --- /dev/null +++ b/public/assets/images/Prosumer_section/Cnsmr_fig2.svg @@ -0,0 +1,1935 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/public/assets/images/TS_section/TS_fig1.svg b/public/assets/images/TS_section/TS_fig1.svg new file mode 100644 index 0000000..f6112a1 --- /dev/null +++ b/public/assets/images/TS_section/TS_fig1.svg @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + RWTH + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/TS_section/TSmap_m1.gif b/public/assets/images/TS_section/TSmap_m1.gif new file mode 100644 index 0000000..26861e2 Binary files /dev/null and b/public/assets/images/TS_section/TSmap_m1.gif differ diff --git a/public/assets/images/TS_section/TSmap_m2.gif b/public/assets/images/TS_section/TSmap_m2.gif new file mode 100644 index 0000000..26861e2 Binary files /dev/null and b/public/assets/images/TS_section/TSmap_m2.gif differ diff --git a/public/assets/images/Title_section/Logo1_EU.svg b/public/assets/images/Title_section/Logo1_EU.svg new file mode 100644 index 0000000..a7df4b9 --- /dev/null +++ b/public/assets/images/Title_section/Logo1_EU.svg @@ -0,0 +1,600 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/Title_section/Logo2_RWTH.svg b/public/assets/images/Title_section/Logo2_RWTH.svg new file mode 100644 index 0000000..a14b6f1 --- /dev/null +++ b/public/assets/images/Title_section/Logo2_RWTH.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/Title_section/Logo3_Polito.svg b/public/assets/images/Title_section/Logo3_Polito.svg new file mode 100644 index 0000000..0a920b9 --- /dev/null +++ b/public/assets/images/Title_section/Logo3_Polito.svg @@ -0,0 +1,2168 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/public/assets/images/Title_section/Logo4_Flexmeter.svg b/public/assets/images/Title_section/Logo4_Flexmeter.svg new file mode 100644 index 0000000..9e0a894 --- /dev/null +++ b/public/assets/images/Title_section/Logo4_Flexmeter.svg @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + +
+

+ Italy - Piedmont region +
+ 380-220kV transmission system +

+ {{#if initState}} + + {{/if}} + {{#if eventState}} + + {{/if}} + 		+

Transmission system simulation

+ 		+ +
+
- - + + + + + + + + + + +
+ +

Control Center

+ 		+ +
+

+ Distribution grid monitoring +
+ Voltage measurement +

+ + {{line-chart data=Voltage203937 height="90%"}} + 		+ + +
+
+ + + + + + +
+

+ Italy - Turin +
+ STURA substation 220/22kV +
+ 22kV distribution system +

+ {{#if initState}} + + {{/if}} + {{#if eventState}} + + {{/if}} + 		+

Distribution system simulation

+ 		+ +
+
+
- {{static-chart data=dataSet options=dataOptions}} + + + + + + + + + + +
+ +

Prosumer behavior

+ 		+ +
+

+ Prosumer: Consumption and generation profiles +

+ + {{line-chart data=LoadProfile height="40%"}} + 		+ +