diff --git a/app/controllers/lab-mashup.js b/app/controllers/lab-mashup.js index 3ebd302..8e1593a 100644 --- a/app/controllers/lab-mashup.js +++ b/app/controllers/lab-mashup.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import ENV from '../config/environment'; export default Ember.Controller.extend({ freq575GreenZones: [{from: 49.5, to: 50.5}], @@ -28,6 +29,11 @@ export default Ember.Controller.extend({ return this.get('state') === 2 || this.get('state') === 0; }.property('state'), + showExtendedView: function() { + Ember.debug(ENV.APP.SHOW_EXTENDED_VIEW); + return ENV.APP.SHOW_EXTENDED_VIEW; + }.property(), + _updateController: function() { // update attribute values this._updateAttributes(); @@ -35,21 +41,28 @@ export default Ember.Controller.extend({ // get new data file control state from store if (this._freezeState === false) { var control = this.store.peekRecord('data-file-control', 'DataFileControl'); + var reload = control.get('ForceReload'); - if (control.get('Filename') === '/share/data/m1_S1_ElectricalGrid_data.txt') { - // state 1 - if (this.get('state') !== 1) { - this.set('state', 1); - } - } else { - // state 2 - if (this.get('state') !== 2) { - this.set('state', 2); + if (reload === false || reload === 'false') { + if (control.get('Filename') === '/share/data/m1_S1_ElectricalGrid_data.txt') { + // state 1 + if (this.get('state') !== 1) { + this.set('state', 1); + + Ember.debug('update state (1)'); + } + } else { + // state 2 + if (this.get('state') !== 2) { + this.set('state', 2); + + Ember.debug('update state (2)'); + } } } var status = control.get('Status'); - var reload = control.get('ForceReload'); + /*Ember.debug('status: ' + status + ', reload: ' + reload);*/ @@ -67,7 +80,7 @@ export default Ember.Controller.extend({ } } - Ember.run.later(this, this._updateController, 100); + Ember.run.later(this, this._updateController, ENV.APP.UPDATE_RATE); }.on('init'), _updateAttributes: function() { diff --git a/app/routes/lab-mashup.js b/app/routes/lab-mashup.js index 2713847..3102b76 100644 --- a/app/routes/lab-mashup.js +++ b/app/routes/lab-mashup.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import ENV from '../config/environment'; export default Ember.Route.extend({ model() { @@ -21,7 +22,7 @@ export default Ember.Route.extend({ // first time call poll Ember.run.later(this, function() { this.refreshEntities(); - }, 100); + }, ENV.APP.UPDATE_RATE); }, refreshEntities: function() { @@ -43,6 +44,6 @@ export default Ember.Route.extend({ // reschedule refresh Ember.run.later(this, function() { this.refreshEntities(); - }, 100); + }, ENV.APP.UPDATE_RATE); } }); diff --git a/app/serializers/application.js b/app/serializers/application.js index a9f3851..afffeff 100644 --- a/app/serializers/application.js +++ b/app/serializers/application.js @@ -80,6 +80,20 @@ export default DS.RESTSerializer.extend({ } }, + normalizeSaveResponse: function(store, primaryModelClass, payload, id, requestType) { + if (payload.contextResponses) { + payload.contextResponses.forEach(function(response) { + if (response.statusCode.code !== 200 && response.statusCode.code !== '200') { + Ember.debug('Failed update DataFileControl: ' + response.statusCode.code + ', ' + response.statusCode.details); + } + }); + } + + Ember.debug('cb response'); + + return { data: {} }; + }, + _normalizePayload: function(payload, handleItem) { var propertyIndex = 0; @@ -145,11 +159,11 @@ export default DS.RESTSerializer.extend({ if (metadata.name === 'timestamp') { timestamp = Date.parse(metadata.value); } else if (metadata.name === 'source') { - source = metadata.value; + source = metadata.value; } else if (metadata.name === 'min') { - minValue = metadata.value; + minValue = metadata.value; } else if (metadata.name === 'max') { - maxValue = metadata.value; + maxValue = metadata.value; } }); } @@ -233,6 +247,12 @@ export default DS.RESTSerializer.extend({ record.get('values').push(value); }); + // erase old data + while (record.get('values').length > 500) { + record.get('values').shift(); + /*Ember.debug('Shift on ' + record.get('name'));*/ + } + record.set('timestamp', item.attributes.timestamp); record.set('currentValue', item.attributes.currentValue); } diff --git a/app/styles/app.css b/app/styles/app.css index 8e299db..155bda4 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -61,29 +61,29 @@ header { color: #103B7D; background-color: #fff; - height: 60px; + height: 80px; top: 0; border-bottom: 3px solid #bbb; } header #title { - font-size: 25px; + font-size: 30px; font-weight: 100; text-align: left; text-rendering: optimizeLegibility; -webkit-text-rendering: optimizeLegiblity; -moz-text-rendering: optimizeLegibitliy; - padding: 15px 0 20px 30px; + padding: 25px 0 20px 30px; float: left; } header #logos { - height: 60px; + height: 80px; - padding-top: 15px; + padding-top: 8px; float: right; } @@ -100,7 +100,7 @@ footer { } #main { - top: 60px; + top: 80px; bottom: 0px; left: 20px; @@ -108,13 +108,13 @@ footer { } .svg-image { - width: 60%; + width: 95%; height: auto; } .svg-logo { width: auto; - height: 30px; + height: 60px; padding-right: 30px; @@ -122,19 +122,19 @@ footer { } #rwth-logo { - margin-top: 10px; + margin-top: 15px; - height: 15px !important; + height: 30px !important; } #DS-image { width: auto; - height: 405px; + height: 395px; } #TS-image { width: auto; - height: 410px; + height: 395px; } h1 { diff --git a/app/templates/application.hbs b/app/templates/application.hbs index a0a0140..4ebf23f 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -6,8 +6,7 @@
- - +
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs index 91ded5a..f3f0318 100644 --- a/app/templates/lab-mashup.hbs +++ b/app/templates/lab-mashup.hbs @@ -63,13 +63,13 @@

Control Center

- +

- Distribution grid monitoring voltage measurement + Distribution grid monitoring: voltage measurement

{{line-chart data=voltage203937 height="90%" xaxisLength=120 minValue=0.90 maxValue=1.05 label="RMS voltage [pu]"}} @@ -81,9 +81,11 @@
-
- Technical -
+ {{#if showExtendedView}} +
+ Extended View +
+ {{/if}} @@ -120,7 +122,7 @@
  • Total length of lines: 38,54 km

    • - {{bar-chart data=totalPValue width='200px' height='250px' maxValue=30}} + {{bar-chart data=totalPValue width='200px' height='230px' maxValue=30}}

    Total Net Consumption [MW]

    @@ -140,7 +142,7 @@

    Prosumer behavior

    - + diff --git a/config/environment.js b/config/environment.js index 6592919..e201c17 100644 --- a/config/environment.js +++ b/config/environment.js @@ -17,7 +17,9 @@ module.exports = function(environment) { // Here you can pass flags/options to your application instance // when it is created - API_HOST: 'http://46.101.131.212:80' + API_HOST: '', + UPDATE_RATE: 200, + SHOW_EXTENDED_VIEW: true, }, contentSecurityPolicy: { @@ -31,6 +33,11 @@ module.exports = function(environment) { } }; + // disable mirage + ENV['ember-cli-mirage'] = { + enabled: false + } + if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; // ENV.APP.LOG_ACTIVE_GENERATION = true; @@ -38,12 +45,7 @@ module.exports = function(environment) { // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_VIEW_LOOKUPS = true; - //ENV.APP.API_HOST = 'http://localhost:4200'; - - ENV['ember-cli-mirage'] = { - //enabled: true - enabled: false - } + ENV.APP.API_HOST = 'http://46.101.131.212:80'; } if (environment === 'test') { @@ -59,12 +61,15 @@ module.exports = function(environment) { } if (environment === 'production') { - ENV.APP.API_HOST = 'http://46.101.131.212:80'; ENV.baseURL = '/simple/'; + } - ENV['ember-cli-mirage'] = { - enabled: false - } + if (environment === 'simple') { + ENV.APP.SHOW_EXTENDED_VIEW = false; + } + + if (environment === 'extended') { + ENV.APP.SHOW_EXTENDED_VIEW = true; } return ENV; diff --git a/public/assets/images/DS_section/DS_fig1.svg b/public/assets/images/DS_section/DS_fig1.svg index 3b8e5a5..2ad4c02 100644 --- a/public/assets/images/DS_section/DS_fig1.svg +++ b/public/assets/images/DS_section/DS_fig1.svg @@ -14,61 +14,8 @@ height="403.98267" id="svg2" version="1.1" - inkscape:version="0.48.0 r9654" + inkscape:version="0.91 r13725" sodipodi:docname="DS_fig1.svg"> - - - - - - - - - - - - - - - - - + orientation="-0.70710678,0.70710678" /> + + + + + + + + + + + + + + + + + @@ -111,12441 +111,83600 @@ + inkscape:groupmode="layer" + inkscape:label="Ebene 1"> + x="-3572.856" + id="text3415-6"> Politecnico di Torino + sodipodi:role="line" + x="-3572.856" + style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial">Politecnico di Torino + transform="matrix(5.6319941,0,0,-5.7141574,-3333.2996,-6012.1306)" + id="g3129-0-8-0"> + clip-path="url(#clipPath3133-3-4-7)" + id="g3131-7-7"> + transform="matrix(61.054565,0,0,69.267319,36.933121,143.2047)" + id="g3139-0-8"> + xlink:href="data:image/png;base64,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" + transform="matrix(1,0,0,-1,0,1)" + height="1" + width="1" /> diff --git a/public/assets/images/PoliTo.svg b/public/assets/images/PoliTo.svg index 0a920b9..075a321 100644 --- a/public/assets/images/PoliTo.svg +++ b/public/assets/images/PoliTo.svg @@ -10,47 +10,15 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="615" - height="260" - id="svg2" + id="svg3336" version="1.1" - inkscape:version="0.48.0 r9654" - sodipodi:docname="Neues Dokument 1"> - - - - - - + inkscape:version="0.91 r13725" + width="679.95001" + height="426.60001" + viewBox="0 0 679.95001 426.60001" + sodipodi:docname="logo.svg"> + id="metadata3342"> @@ -61,2108 +29,53177 @@ - - + + - + id="image3344" + x="0" + y="0" /> diff --git a/public/assets/images/Prosumer_section/Cnsmr_fig1.svg b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg index 492884c..ce7bc6d 100644 --- a/public/assets/images/Prosumer_section/Cnsmr_fig1.svg +++ b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg @@ -14,40 +14,8 @@ height="405.16147" id="svg2" version="1.1" - inkscape:version="0.48.0 r9654" + inkscape:version="0.91 r13725" sodipodi:docname="Cnsmr_fig1.svg"> - - - - - - - - - - - + + + + + + + + + + + @@ -83,571 +83,853 @@ + inkscape:groupmode="layer" + inkscape:label="Ebene 1"> + transform="matrix(1.1812552,0,0,1.1812552,-3607.6224,-7437.7077)"> + id="g3937"> + clip-path="url(#clipPath3943)" + id="g3941"> + transform="translate(10.4507,179.0083)" + id="g3947"> + inkscape:connector-curvature="0" /> + transform="translate(115.7349,192.1714)" + id="g3951"> + inkscape:connector-curvature="0" /> + transform="translate(129.4746,193.4189)" + id="g3955"> + inkscape:connector-curvature="0" /> + transform="translate(110.5361,167.0308)" + id="g3959"> + inkscape:connector-curvature="0" /> + transform="translate(112.2012,157.3735)" + id="g3963"> + inkscape:connector-curvature="0" /> + transform="translate(111.3936,148.9546)" + id="g3967"> + inkscape:connector-curvature="0" /> + transform="translate(110.6523,140.7002)" + id="g3971"> + inkscape:connector-curvature="0" /> + transform="translate(110.0659,132.4102)" + id="g3975"> + inkscape:connector-curvature="0" /> + transform="translate(109.5449,124.0684)" + id="g3979"> + inkscape:connector-curvature="0" /> + transform="translate(109.2129,115.8447)" + id="g3983"> + inkscape:connector-curvature="0" /> + transform="translate(92.1865,107.8984)" + id="g3987"> + inkscape:connector-curvature="0" /> + transform="translate(140.7427,98.959)" + id="g3991"> + inkscape:connector-curvature="0" /> + transform="translate(129.0107,183.8701)" + id="g3995"> + inkscape:connector-curvature="0" /> + d="m 64.606,48.754 114.129,0 0,50.754 -114.129,0 0,-50.754 z" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + transform="translate(122.9189,162.7139)" + id="g4003"> + inkscape:connector-curvature="0" /> + transform="translate(123.0586,111.79)" + id="g4007"> + inkscape:connector-curvature="0" /> + transform="translate(135.6553,115.1621)" + id="g4011"> + inkscape:connector-curvature="0" /> + transform="translate(135.6553,159.3169)" + id="g4015"> + inkscape:connector-curvature="0" /> + transform="translate(145.0078,149.9653)" + id="g4019"> + inkscape:connector-curvature="0" /> + transform="translate(145.0078,124.3867)" + id="g4023"> + inkscape:connector-curvature="0" /> + transform="translate(148.5117,137.3711)" + id="g4027"> + inkscape:connector-curvature="0" /> + transform="translate(110.0762,159.2856)" + id="g4031"> + inkscape:connector-curvature="0" /> + transform="translate(100.9834,149.9341)" + id="g4035"> + inkscape:connector-curvature="0" /> + transform="translate(97.6084,137.3398)" + id="g4039"> + inkscape:connector-curvature="0" /> + transform="translate(100.9834,124.3555)" + id="g4043"> + inkscape:connector-curvature="0" /> + transform="translate(110.209,115.1309)" + id="g4047"> + d="M 0,0 3.971,0 0.77,-2.4 2.007,-6.207 -1.175,-3.858 -4.364,-6.207 -3.107,-2.4 -6.333,0 -2.375,0 -1.175,3.713 0,0 z" + inkscape:connector-curvature="0" /> + d="m 64.606,43.74 114.159,0 0,6.517 -114.159,0 0,-6.517 z" + inkscape:connector-curvature="0" /> + transform="translate(195.001,227.2148)" + id="g4053"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,216.6758)" + id="g4057"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,206.0908)" + id="g4061"> + inkscape:connector-curvature="0" /> + transform="translate(194.9551,195.6914)" + id="g4065"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,184.874)" + id="g4069"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,174.8462)" + id="g4073"> + inkscape:connector-curvature="0" /> + transform="translate(194.9541,164.1216)" + id="g4077"> + inkscape:connector-curvature="0" /> + transform="translate(194.9541,153.8618)" + id="g4081"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,143.6016)" + id="g4085"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,133.1563)" + id="g4089"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,122.5713)" + id="g4093"> + inkscape:connector-curvature="0" /> + transform="translate(194.9551,112.125)" + id="g4097"> + inkscape:connector-curvature="0" /> + transform="translate(195.001,101.3096)" + id="g4101"> + inkscape:connector-curvature="0" /> + transform="translate(71.2783,89.6855)" + id="g4105"> + inkscape:connector-curvature="0" /> + transform="translate(87.0483,78.0898)" + id="g4109"> + inkscape:connector-curvature="0" /> + transform="translate(90.8984,78.4316)" + id="g4113"> + inkscape:connector-curvature="0" /> + transform="translate(98.4771,85.3643)" + id="g4117"> + inkscape:connector-curvature="0" /> + transform="translate(107.8188,85.2559)" + id="g4121"> + inkscape:connector-curvature="0" /> + transform="translate(114.3701,83.3115)" + id="g4125"> + inkscape:connector-curvature="0" /> + transform="translate(126.377,82.1055)" + id="g4129"> + inkscape:connector-curvature="0" /> + transform="translate(137.1953,78.0898)" + id="g4133"> + inkscape:connector-curvature="0" /> + transform="translate(75.9775,71.1719)" + id="g4137"> + inkscape:connector-curvature="0" /> + transform="translate(83.6992,66.3643)" + id="g4141"> + inkscape:connector-curvature="0" /> + transform="translate(101.27,59.0898)" + id="g4145"> + inkscape:connector-curvature="0" /> + transform="translate(115.3818,59.0898)" + id="g4149"> + inkscape:connector-curvature="0" /> + transform="translate(119.1406,59.4316)" + id="g4153"> + inkscape:connector-curvature="0" /> + transform="translate(123.605,58.9453)" + id="g4157"> + inkscape:connector-curvature="0" /> + transform="translate(131.147,58.9453)" + id="g4161"> + inkscape:connector-curvature="0" /> + transform="translate(137.9512,59.4316)" + id="g4165"> + inkscape:connector-curvature="0" /> + transform="translate(143.1533,66.3643)" + id="g4169"> + inkscape:connector-curvature="0" /> + transform="translate(155.4307,59.0898)" + id="g4173"> + d="M 0,0 -1.296,0 C -1.53,0 -1.638,0.108 -1.638,0.342 l 0.018,5.059 c 0,1.063 -0.252,1.765 -1.297,1.765 -0.72,0 -1.98,-0.576 -2.466,-0.811 l 0,-6.013 C -5.383,0.126 -5.474,0 -5.726,0 l -1.278,0 c -0.252,0 -0.342,0.108 -0.342,0.342 l 0,8.121 c 0,0.233 0.09,0.359 0.342,0.359 l 1.278,0 c 0.252,0 0.343,-0.126 0.343,-0.359 l 0,-0.541 c 0.018,0 0.035,-0.018 0.054,-0.018 0.666,0.468 1.927,1.08 3.024,1.08 2.431,0 2.648,-1.602 2.648,-3.421 l 0,-5.221 C 0.343,0.126 0.271,0 0,0" + inkscape:connector-curvature="0" /> + x="-3966.4153" + id="text3415-6"> - + JRC Petten + sodipodi:role="line" + x="-3966.4153" + style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial">JRC Petten + height="410" + width="347.96054" />