Merge pull request #4155 from quintel/heat-2023

Temperature levels for district heating

app/assets/javascripts/lib/app.coffee

@@ -63,13 +63,20 @@ class @AppView extends Backbone.View
 
     # Create heat network order.
     if (heat_order = wrapper.find('#heat-network-options')).length
-      new UserSortable(heat_order, 'heat_network_order', { capacity: true }).render()
+      @heat_order = new UserSortable(
+        heat_order,
+        'heat_network_order',
+        { subtype: heat_order.data('subtype') },
+        { capacity: true }
+      )
+      @heat_order.render()
 
     # Create forecast storage order.
     if (forecast_storage_order = wrapper.find('#forecast-storage-order')).length
       new UserSortable(
         forecast_storage_order,
         'forecast_storage_order',
+        {},
         { capacity: true, sortable: true }
       ).render()
 
@@ -240,6 +247,8 @@ class @AppView extends Backbone.View
     input_params = @input_elements.api_update_params()
     @input_elements.reset_dirty()
     @call_api(input_params)
+    if (@heat_order)
+      @heat_order.render()
 
   showLoading: ->
     # D3 charts shouldn't be blocked, only jqPlot ones

app/assets/javascripts/lib/util/user_sortable.js

@@ -146,11 +146,12 @@
    * Handles setting up the user-sortable order and triggers fetching and
    * receiving the order from ETEngine.
    */
-  var UserSortable = function (element, resourcePath, fetchOptions) {
+  var UserSortable = function (element, resourcePath, resourceOptions, fetchOptions) {
     this.element = $(element);
     this.lastGood = null;
     this.i18nKey = this.resourcePath = resourcePath;
     this.url = App.scenario.url_path() + '/' + resourcePath;
+    this.resourceOptions = resourceOptions || {};
     this.fetchOptions = fetchOptions || {};
   };
 
@@ -165,6 +166,7 @@
 
     var xhr = $.ajax({
       url: this.url,
+      data: this.resourceOptions,
       headers: App.accessToken.headers(),
       type: 'GET',
     });
@@ -186,6 +188,8 @@
           return !extraData.isLocked[item];
         });
 
+        sortableEl.empty();
+
         renderOptions(sortableEl, sortableOrder, extraData.capacity, self.i18nKey);
 
         // Any locked items are shown below the list.
@@ -220,7 +224,7 @@
       var self = this;
       var options = sortable.toArray();
 
-      var data = {};
+      var data = this.resourceOptions;
       data[this.resourcePath] = { order: options };
 
       var xhr = $.ajax({

app/assets/javascripts/lib/views/plant_profitability_table_view.coffee

@@ -51,13 +51,17 @@ class @PlantProfitabilityTableView extends HtmlTableChartView
   series_labels:
     agriculture_chp_engine_network_gas_dispatchable: 'agriculture_chp_gas_dispatchable'
     agriculture_chp_wood_pellets: 'agriculture_chp_wood_pellets'
-    energy_chp_combined_cycle_network_gas: 'central_gas_chp'
-    energy_chp_ultra_supercritical_coal: 'coal_chp'
-    energy_chp_ultra_supercritical_cofiring_coal: 'coal_chp_cofiring'
+    energy_chp_combined_cycle_ht_network_gas: 'gas_chp_ccgt_ht'
+    energy_chp_combined_cycle_mt_network_gas: 'gas_chp_ccgt_mt'
+    energy_chp_ultra_supercritical_ht_coal: 'coal_chp_pwd_ht'
+    energy_chp_ultra_supercritical_mt_coal: 'coal_chp_pwd_mt'
+    energy_chp_ultra_supercritical_cofiring_ht_coal: 'coal_chp_pwd_cofiring_ht'
+    energy_chp_ultra_supercritical_cofiring_mt_coal: 'coal_chp_pwd_cofiring_mt'
     energy_power_supercritical_coal: 'coal_conv'
     energy_power_combined_cycle_coal: 'coal_igcc'
     energy_power_combined_cycle_ccs_coal: 'coal_igcc_ccs'
-    energy_chp_ultra_supercritical_lignite: 'lignite_chp'
+    energy_chp_ultra_supercritical_ht_lignite: 'lignite_chp_ht'
+    energy_chp_ultra_supercritical_mt_lignite: 'lignite_chp_mt'
     energy_power_ultra_supercritical_coal: 'coal_pwd'
     energy_power_ultra_supercritical_cofiring_coal: 'coal_pwd_cofiring'
     energy_power_ultra_supercritical_ccs_coal: 'coal_pwd_ccs'
@@ -71,8 +75,10 @@ class @PlantProfitabilityTableView extends HtmlTableChartView
     energy_power_ultra_supercritical_oxyfuel_ccs_lignite: 'lignite_oxy'
     energy_power_supercritical_waste_mix: 'energy_power_supercritical_waste_mix'
     energy_power_supercritical_ccs_waste_mix: 'energy_power_supercritical_ccs_waste_mix'
-    energy_chp_supercritical_waste_mix: 'energy_chp_supercritical_waste_mix'
-    energy_chp_supercritical_ccs_waste_mix: 'energy_chp_supercritical_ccs_waste_mix'
+    energy_chp_supercritical_ht_waste_mix: 'waste_chp_ht'
+    energy_chp_supercritical_mt_waste_mix: 'waste_chp_mt'
+    energy_chp_supercritical_ccs_ht_waste_mix: 'waste_chp_ccs_ht'
+    energy_chp_supercritical_ccs_mt_waste_mix: 'waste_chp_ccs_mt'
     industry_chp_combined_cycle_gas_power_fuelmix: 'industry_chp_gas_ccgt'
     industry_chp_turbine_gas_power_fuelmix: 'industry_chp_gas_turbine'
     industry_chp_engine_gas_power_fuelmix: 'industry_chp_gas_engine'
@@ -84,8 +90,10 @@ class @PlantProfitabilityTableView extends HtmlTableChartView
     energy_power_ultra_supercritical_crude_oil: 'oil_plant'
     energy_power_combined_cycle_hydrogen: 'hydrogen_ccgt'
     energy_power_turbine_hydrogen: 'hydrogen_turbine'
-    energy_chp_local_wood_pellets: 'local_chp_wood'
-    energy_chp_local_engine_network_gas: 'local_chp_gas'
+    energy_chp_local_ht_wood_pellets: 'wood_pellets_chp_ht'
+    energy_chp_local_mt_wood_pellets: 'wood_pellets_chp_mt'
+    energy_chp_local_engine_ht_network_gas: 'gas_chp_engine_ht'
+    energy_chp_local_engine_mt_network_gas: 'gas_chp_engine_mt'
     energy_power_hydro_mountain: 'hydro_mountain'
     industry_chp_turbine_hydrogen: 'industry_chp_hydrogen_turbine'
 

app/assets/stylesheets/_chart.sass

@@ -125,6 +125,7 @@ $chart-header-icon-color: #333
 
 .charts_container
   position: relative
+  margin-top: 5px
   .chart_canvas
     // zoomed charts and dashboard popups redefine the height
     min-height: 330px
@@ -411,8 +412,9 @@ div.d3_container
         shape-rendering: crispEdges
         fill-opacity: .75
       text.label
-        text-shadow: 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #fff, 0 0 5px #fff
-        font-size: 11px
+        font-size: 0.75rem
+        &.last-label
+          text-anchor: end
   &.mekko
     rect.carrier
       stroke: #333

app/assets/stylesheets/_root.sass

@@ -175,6 +175,8 @@ body#root
         @include flag($region: "sk_slovakia")
       &.UK_united_kingdom
         @include flag($region: "uk_united_kingdom")
+      &.UK_united_kingdom
+        @include flag($region: "sg_singapore")
 
       // &.UKNI01_northern_ireland
     span.root-button

app/views/content/whats_new.en.html.md

@@ -92,7 +92,7 @@ Currently, ships for inland waterway transport are often fitted with conventiona
 -> ![](/assets/pages/whats_new/bio_ethanol_inland_shipping_en.png) <-
 
 ## Hydrogen use in the industrial heating network
-Two new technologies have been added that can supply steam to the industrial heat network. You can now install capacity for a hydrogen turbine CHP, which produces both steam and electricity, and for a hydrogen heater, which only produces steam. Go to *Demand → Industry* → **[Heat network sources](/scenario/demand/industry/heat-network-sources)** to check it out.
+Two new technologies have been added that can supply steam to the industrial heat network. You can now install capacity for a hydrogen turbine CHP, which produces both steam and electricity, and for a hydrogen heater, which only produces steam. Go to *Demand → Industry* → **[Steam network sources](/scenario/demand/industry/steam-network-sources)** to check it out.
 ___
 
 # November 2022

app/views/content/whats_new.nl.html.md

@@ -93,7 +93,7 @@ Vervolgens kun je bio-ethanol toevoegen door de brandstofmix aan te passen in *A
 -> ![](/assets/pages/whats_new/bio_ethanol_inland_shipping_nl.png) <-
 
 ## Waterstofgebruik in het industriële warmtenet
-Er zijn twee nieuwe technologieën toegevoegd die stoom kunnen leveren aan het industriële warmtenet. Je kunt nu vermogen installeren voor een waterstofturbine-WKK, die zowel stoom als elektriciteit produceert, en voor een waterstofketel, die alleen stoom produceert. Ga hiervoor naar *Vraag → Industrie* → **[Bronnen warmtenet](/scenario/demand/industry/heat-network-sources)**.
+Er zijn twee nieuwe technologieën toegevoegd die stoom kunnen leveren aan het industriële warmtenet. Je kunt nu vermogen installeren voor een waterstofturbine-WKK, die zowel stoom als elektriciteit produceert, en voor een waterstofketel, die alleen stoom produceert. Ga hiervoor naar *Vraag → Industrie* → **[Bronnen stoomnet](/scenario/demand/industry/steam-network-sources)**.
 
 ___