Commit 2082a91a authored by David's avatar David

Merge branch 'patch-1' into 'master'

Update Calculator.php

See merge request !2
parents a028a8c6 f97f6a63
......@@ -16,7 +16,7 @@ In the wealthiest nations of the world, a large part of the freshwater and energ
For instance, in an average french household, <a href="https://www.cieau.com/le-metier-de-leau/ressource-en-eau-eau-potable-eaux-usees/quels-sont-les-usages-domestiques-de-leau/" target="_blank">39%</a> of this water is used for bathing and showering and hot water represents <a href="https://www.ademe.fr/particuliers-eco-citoyens/habitation/bien-gerer-habitat/leau-chaude-sanitaire" target="_blank">12%</a> of the energy consumption.
It is therefore judicious to think about ways to reduce this consumption.
The <a href="http://showerloop.org" target="_blank">showerloop</a> is a water recycling shower : water is in a closed loop, it fall again on my head once filtered and therefore clean.
It is adequate in terms of water and energy savings, and the following calculator will illustrate this. ') ?> :</p>
It is adequate in terms of water and energy savings, and the following calculator will illustrate this') ?> :</p>
<?php
// Scan conf
......@@ -171,7 +171,7 @@ Thank you for your contribution') ?>
</div>
<div class="form HotWaterSystem">
<label><?= _('You\'re current water heating system : ') ?> :</label>
<label><?= _('You\'re current water heating system') ?> :</label>
<select class="shared" name="HotWaterSystem" id="HotWaterSystem">
<?php
// Switch to default energy if enrgy not disponible in this config
......@@ -198,7 +198,7 @@ Thank you for your contribution') ?>
<h2 class="titre you"><?= _('With your current shower') ?> :</h2>
<div class="form ShowerFlow"é>
<label><?= _('Flow rate of your shower :') ?> :</label>
<label><?= _('Flow rate of your shower') ?> :</label>
<input class="shared" id="ShowerFlow" type="number" min="1" max="99" style="width: 100px;" value="<?php echo valeurRecup('ShowerFlow'); ?>" name="ShowerFlow" /> L/min
<!--Creates the popup body-->
<div class="popup-overlay">
......@@ -253,18 +253,18 @@ Thank you for your contribution') ?>
</div>
<p id="txtWaterPerShowerloop"><?= _('This model of showerloop uses <b><span id="WaterPerShowerloop">?</span>L of water</b>, meaning') ?> <span id="CostWaterPerShowerloop">?</span><?= $config_ini['general']['currency'] ?></p>
<p><?= _('You’re saving <b><span id="WaterPerShowerCompare">?</span>% of water</b> compared to a typical shower') ?>
<p id="txtWattPerShowerloopHotWater"><?= _('You would need <span id="WattPerShowerloopHotWater">?</span>kWh of energy to heat the water.') ?></p>
<p id="txtWattPerShowerloopOperation"><?= _('You would need <span id="WattPerShowerloopOperation">?</span>kWh of energy to run the showerloop.') ?></p>
<p><?= _('You would save <b><span id="WaterPerShowerCompare">?</span>% of water</b> compared to a typical shower') ?>
<p id="txtWattPerShowerloopHotWater"><?= _('You would need <span id="WattPerShowerloopHotWater">?</span>kWh of energy to heat the water') ?></p>
<p id="txtWattPerShowerloopOperation"><?= _('You would need <span id="WattPerShowerloopOperation">?</span>kWh of energy to run the showerloop') ?></p>
<p id="txtWattPerShowerloopTotal"><?= _('You would need <b><span id="WattPerShowerloopTotal">?</span>kWh of energy</b> per shower meaning') ?> <span id="CostWattPerShowerloop">?</span><?= $config_ini['general']['currency'] ?></p>
<p><?= _('You would save <b><span id="WattPerShowerCompare">?</span>% of energy</b> compared to a typical shower') ?>
<p id="txtCostGlobalPerShowerloop"><?= _('A shower would cost you') ?> <b><span id="CostGlobalPerShowerloop">?</span><?= $config_ini['general']['currency'] ?></b></p>
<h3 id="txtShowerloopPerYear"><?= _('Yearly, for your household') ?></h3>
<p><?= _('You would use <b><span id="WaterShowerloopPerYear">?</span>L of water</b> per year to shower, meaning') ?> <span id="CostWaterShowerloopPerYear">?</span><?= $config_ini['general']['currency'] ?></p>
<p><?= _('You need <b><span id="WattShowerloopPerYear">?</span>kWh of energy</b> to shower per year to shower, meaning') ?> <span id="CostWattShowerloopPerYear">?</span><?= $config_ini['general']['currency'] ?></p>
<p><b><?= _('You have an annuel budget estimated to be around') ?> <span id="CostGlobalShowerloopPerYear">?</span><?= $config_ini['general']['currency'] ?></b></p>
<p id="txtRoi"><?= _('The purchase of the equipment will pay for itself in <span id="roi">?</span> year') ?> </p>
<p><?= _('You would need <b><span id="WattShowerloopPerYear">?</span>kWh of energy</b> per year to shower, meaning') ?> <span id="CostWattShowerloopPerYear">?</span><?= $config_ini['general']['currency'] ?></p>
<p><b><?= _('You would have an annuel budget estimated to be around') ?> <span id="CostGlobalShowerloopPerYear">?</span><?= $config_ini['general']['currency'] ?></b></p>
<p id="txtRoi"><?= _('The purchase of the equipment would pay for itself in <span id="roi">?</span> year(s)') ?> </p>
</div>
......@@ -297,7 +297,7 @@ Thank you for your contribution') ?>
},
title: {
display: true,
text: "<?= _('The purchase of the equipment will pay for itself in') ?>"
text: "<?= _('Total water consumption for the household per year for showering') ?>"
},
scales: {
yAxes: [{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment