Surface < 40m2
-
Bonjour,
Pour le DPE, les logements < 40m2 classés en F basculent en E.
Le patch correspondant, pour la v1.5 :
Index: wp-content/plugins/wp-dpe-ges/shortcode/shortcode.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/wp-content/plugins/wp-dpe-ges/shortcode/shortcode.php b/wp-content/plugins/wp-dpe-ges/shortcode/shortcode.php
--- a/wp-content/plugins/wp-dpe-ges/shortcode/shortcode.php
+++ b/wp-content/plugins/wp-dpe-ges/shortcode/shortcode.php
@@ -21,6 +21,7 @@
function wpdpeges_html_dpe( $atts ){
$dpe = shortcode_atts( array(
'value' => '',
+ 'surface_value' => '',
'inline' => 'false',
'meta_key' => null
), $atts );
@@ -33,6 +34,7 @@
}else {
$valueDPE = $dpe['value'];
}
+ $surface_value =
$valueGES = 0;
$displayInline = $dpe['inline'];
$displayDPE = true;
@@ -93,6 +95,7 @@
$args = shortcode_atts( array(
'dpe_value' => '',
'ges_value' => '',
+ 'surface_value' => '',
'inline' => 'true',
'dpe_meta_key' => null,
'ges_meta_key' => null
@@ -110,8 +113,9 @@
}else {
$ges_value = $args['ges_value'];
}
+ $surface_value = $args['surface_value'];
$display_inline = 'true' === $args['inline'];
include apply_filters( 'wpdpeges_shorcode_template', plugin_dir_path( __FILE__ ) . 'newdpeges-template.php', 'newdpeges' );
$output = ob_get_clean();
return $output;
-}
\ No newline at end of file
+}
Index: wp-content/plugins/wp-dpe-ges/shortcode/dpeges-template.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/wp-content/plugins/wp-dpe-ges/shortcode/dpeges-template.php b/wp-content/plugins/wp-dpe-ges/shortcode/dpeges-template.php
--- a/wp-content/plugins/wp-dpe-ges/shortcode/dpeges-template.php
+++ b/wp-content/plugins/wp-dpe-ges/shortcode/dpeges-template.php
@@ -35,6 +35,9 @@
elseif($valueDPE <= 450): $lettre_dpe = 'F';
elseif($valueDPE > 450): $lettre_dpe = 'G';
endif;
+ if ($lettre_dpe == 'F' && (is_numeric($surface_value) && $surface_value < 40)) {
+ $lettre_dpe = 'E';
+ }
?>
<div class="dpe<?php echo $classSC.$classBlank; ?>">
<span class="title"><?php _e('Energy performance diagnostic', 'wpdpeges'); ?></span>
@@ -66,7 +69,7 @@
</div>
<?php endif; ?>
- <?php
+ <?php
// GES
if ( $displayGES ):
if( empty($valueGES) ):
Index: wp-content/plugins/wp-dpe-ges/shortcode/newdpeges-template.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/wp-content/plugins/wp-dpe-ges/shortcode/newdpeges-template.php b/wp-content/plugins/wp-dpe-ges/shortcode/newdpeges-template.php
--- a/wp-content/plugins/wp-dpe-ges/shortcode/newdpeges-template.php
+++ b/wp-content/plugins/wp-dpe-ges/shortcode/newdpeges-template.php
@@ -4,29 +4,48 @@
$DpeGesInline = $display_inline ? 'energyDiagnosticContainer_inline' : 'energyDiagnosticContainer';
$lettre_dpe = '';
$lettre_ges = '';
-$dpe_value = str_replace(',','.',$dpe_value);
-$ges_value = str_replace(',','.',$ges_value);
+$dpe_value = str_replace(',', '.', $dpe_value);
+$ges_value = str_replace(',', '.', $ges_value);
+$surface_value = (float) str_replace(',', '.', $surface_value);
-if ( (is_numeric($dpe_value) && $dpe_value < 70) || (is_string($dpe_value) && strtoupper($dpe_value) == 'A') ) { $lettre_dpe = 'A';
-}else if ( (is_numeric($dpe_value) && $dpe_value < 110) || (is_string($dpe_value) && strtoupper($dpe_value) == 'B') ){ $lettre_dpe = 'B';
-}else if ( (is_numeric($dpe_value) && $dpe_value < 180) || (is_string($dpe_value) && strtoupper($dpe_value) == 'C') ){ $lettre_dpe = 'C';
-}else if ( (is_numeric($dpe_value) && $dpe_value < 250) || (is_string($dpe_value) && strtoupper($dpe_value) == 'D') ){ $lettre_dpe = 'D';
-}else if ( (is_numeric($dpe_value) && $dpe_value < 330) || (is_string($dpe_value) && strtoupper($dpe_value) == 'E') ){ $lettre_dpe = 'E';
-}else if ( (is_numeric($dpe_value) && $dpe_value < 420) || (is_string($dpe_value) && strtoupper($dpe_value) == 'F') ){ $lettre_dpe = 'F';
-}else if ( (is_numeric($dpe_value) && $dpe_value >= 420) || (is_string($dpe_value) && strtoupper($dpe_value) == 'G') ){ $lettre_dpe = 'G';
+if ((is_numeric($dpe_value) && $dpe_value < 70) || (is_string($dpe_value) && strtoupper($dpe_value) == 'A')) {
+ $lettre_dpe = 'A';
+} else if ((is_numeric($dpe_value) && $dpe_value < 110) || (is_string($dpe_value) && strtoupper($dpe_value) == 'B')) {
+ $lettre_dpe = 'B';
+} else if ((is_numeric($dpe_value) && $dpe_value < 180) || (is_string($dpe_value) && strtoupper($dpe_value) == 'C')) {
+ $lettre_dpe = 'C';
+} else if ((is_numeric($dpe_value) && $dpe_value < 250) || (is_string($dpe_value) && strtoupper($dpe_value) == 'D')) {
+ $lettre_dpe = 'D';
+} else if ((is_numeric($dpe_value) && $dpe_value < 330) || (is_string($dpe_value) && strtoupper($dpe_value) == 'E')) {
+ $lettre_dpe = 'E';
+} else if ((is_numeric($dpe_value) && $dpe_value < 420) || (is_string($dpe_value) && strtoupper($dpe_value) == 'F')) {
+ $lettre_dpe = 'F';
+} else if ((is_numeric($dpe_value) && $dpe_value >= 420) || (is_string($dpe_value) && strtoupper($dpe_value) == 'G')) {
+ $lettre_dpe = 'G';
};
-if ( (is_numeric($ges_value) && $ges_value < 6) || (is_string($ges_value) && strtoupper($ges_value) == 'A') ) { $lettre_ges = 'A';
-}else if( (is_numeric($ges_value) && $ges_value < 11) || (is_string($ges_value) && strtoupper($ges_value) == 'B') ){ $lettre_ges = 'B';
-}else if( (is_numeric($ges_value) && $ges_value < 30) || (is_string($ges_value) && strtoupper($ges_value) == 'C') ){ $lettre_ges = 'C';
-}else if( (is_numeric($ges_value) && $ges_value < 50) || (is_string($ges_value) && strtoupper($ges_value) == 'D') ){ $lettre_ges = 'D';
-}else if( (is_numeric($ges_value) && $ges_value < 70) || (is_string($ges_value) && strtoupper($ges_value) == 'E') ){ $lettre_ges = 'E';
-}else if( (is_numeric($ges_value) && $ges_value < 100) || (is_string($ges_value) && strtoupper($ges_value) == 'F') ){ $lettre_ges = 'F';
-}else if( (is_numeric($ges_value) && $ges_value >= 100) || (is_string($ges_value) && strtoupper($ges_value) == 'G') ){ $lettre_ges = 'G';
+if ($lettre_dpe == 'F' && (is_numeric($surface_value) && $surface_value < 40)) {
+ $lettre_dpe = 'E';
+}
+
+if ((is_numeric($ges_value) && $ges_value < 6) || (is_string($ges_value) && strtoupper($ges_value) == 'A')) {
+ $lettre_ges = 'A';
+} else if ((is_numeric($ges_value) && $ges_value < 11) || (is_string($ges_value) && strtoupper($ges_value) == 'B')) {
+ $lettre_ges = 'B';
+} else if ((is_numeric($ges_value) && $ges_value < 30) || (is_string($ges_value) && strtoupper($ges_value) == 'C')) {
+ $lettre_ges = 'C';
+} else if ((is_numeric($ges_value) && $ges_value < 50) || (is_string($ges_value) && strtoupper($ges_value) == 'D')) {
+ $lettre_ges = 'D';
+} else if ((is_numeric($ges_value) && $ges_value < 70) || (is_string($ges_value) && strtoupper($ges_value) == 'E')) {
+ $lettre_ges = 'E';
+} else if ((is_numeric($ges_value) && $ges_value < 100) || (is_string($ges_value) && strtoupper($ges_value) == 'F')) {
+ $lettre_ges = 'F';
+} else if ((is_numeric($ges_value) && $ges_value >= 100) || (is_string($ges_value) && strtoupper($ges_value) == 'G')) {
+ $lettre_ges = 'G';
};
$comparer_lettre = ['' => 0, 'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7];
-if( $comparer_lettre[$lettre_ges] > $comparer_lettre[$lettre_dpe] ){
+if ($comparer_lettre[$lettre_ges] > $comparer_lettre[$lettre_dpe]) {
$lettre_dpe = $lettre_ges;
}
@@ -40,21 +59,23 @@
<div class="<?php echo $DpeGesInline; ?>">
<div class="<?php echo $dpeClass; ?>">
- <span class="dpe-title"><?php _e( 'Energy performance diagnostic', 'wpdpeges' ); ?></span>
+ <span class="dpe-title"><?php _e('Energy performance diagnostic', 'wpdpeges'); ?></span>
<figure class="diagnostic diagnostic-dpe">
<div class="diagnostic-container" aria-hidden="true">
<div class="<?php echo $dpeContainerClass; ?>">
<span class="diagnostic-number-container">
<span class="diagnostic-number" aria-hidden="false"><?php echo $dpe_value; ?></span>
- <abbr title="<?php _e('Primary Energy Unit', 'wpdpeges'); ?>"><?php _e( 'KWh/m2.year', 'wpdpeges' ); ?></abbr>
+ <abbr
+ title="<?php _e('Primary Energy Unit', 'wpdpeges'); ?>"><?php _e('KWh/m2.year', 'wpdpeges'); ?></abbr>
</span>
<span class="emission-number-container">
<span class="emission-number" aria-hidden="false"><?php echo $ges_value; ?>*</span>
- <abbr title="<?php _e('Quantity of greenhouse gas emissions', 'wpdpeges'); ?>"><?php _e( 'kg CO2/m2.year', 'wpdpeges' ); ?></abbr>
+ <abbr
+ title="<?php _e('Quantity of greenhouse gas emissions', 'wpdpeges'); ?>"><?php _e('kg CO2/m2.year', 'wpdpeges'); ?></abbr>
</span>
</div>
<div class="<?php echo $dpeDiagramContainerClass; ?>">
- <div class="diagnostic-legend-top"><span><?php _e( 'Efficient housing', 'wpdpeges' ); ?></span></div>
+ <div class="diagnostic-legend-top"><span><?php _e('Efficient housing', 'wpdpeges'); ?></span></div>
<div class="diagnostic-line line-a"><span class="diagnostic-letter letter-a">A</span></div>
<div class="diagnostic-line line-b"><span class="diagnostic-letter letter-b">B</span></div>
<div class="diagnostic-line line-c"><span class="diagnostic-letter letter-c">C</span></div>
@@ -62,22 +83,23 @@
<div class="diagnostic-line line-e"><span class="diagnostic-letter letter-e">E</span></div>
<div class="diagnostic-line line-f"><span class="diagnostic-letter letter-f">F</span></div>
<div class="diagnostic-line line-g"><span class="diagnostic-letter letter-g">G</span></div>
- <div class="diagnostic-legend-bottom"><span><?php _e( 'High energy housing', 'wpdpeges' ); ?></span></div>
+ <div class="diagnostic-legend-bottom"><span><?php _e('High energy housing', 'wpdpeges'); ?></span>
+ </div>
</div>
</div>
<div class="dpe-blank">
- <span class="dpe-blank-title"><?php _e( 'DPE blank', 'wpdpeges' ); ?></span>
- <span class="dpe-blank-legend"><?php _e( 'Non-usable consumption', 'wpdpeges' ); ?></span>
+ <span class="dpe-blank-title"><?php _e('DPE blank', 'wpdpeges'); ?></span>
+ <span class="dpe-blank-legend"><?php _e('Non-usable consumption', 'wpdpeges'); ?></span>
</div>
</figure>
</div>
<div class="<?php echo $gesClass; ?>">
- <span class="ges-title"><?php _e( '* Of which greenhouse gas emissions', 'wpdpeges' ); ?></span>
+ <span class="ges-title"><?php _e('* Of which greenhouse gas emissions', 'wpdpeges'); ?></span>
<figure class="emission emission-ges">
<div class="emission-container " aria-hidden="true">
<div class="<?php echo $gesDiagramContainerClass; ?>">
- <div class="emission-legend-top"><span><?php _e( 'Low GHG emissions', 'wpdpeges' ); ?></span> </div>
+ <div class="emission-legend-top"><span><?php _e('Low GHG emissions', 'wpdpeges'); ?></span></div>
<div class="emission-line line-a"><span class="emission-letter letter-a">A</span></div>
<div class="emission-line line-b"><span class="emission-letter letter-b">B</span></div>
<div class="emission-line line-c"><span class="emission-letter letter-c">C</span></div>
@@ -85,20 +107,22 @@
<div class="emission-line line-e"><span class="emission-letter letter-e">E</span></div>
<div class="emission-line line-f"><span class="emission-letter letter-f">F</span></div>
<div class="emission-line line-g"><span class="emission-letter letter-g">G</span></div>
- <div class="emission-legend-bottom"><span><?php _e( 'High GHG emissions', 'wpdpeges' ); ?></span></div>
+ <div class="emission-legend-bottom"><span><?php _e('High GHG emissions', 'wpdpeges'); ?></span>
+ </div>
</div>
<div class="<?php echo $gesContainerClass; ?>">
<span class="emission-number-container">
<span class="emission-number" aria-hidden="false"><?php echo $ges_value; ?></span>
- <abbr title="<?php _e('Quantity of greenhouse gas emissions', 'wpdpeges'); ?>"><?php _e( 'KgeqCO2 / m2.year', 'wpdpeges' ); ?></abbr>
+ <abbr
+ title="<?php _e('Quantity of greenhouse gas emissions', 'wpdpeges'); ?>"><?php _e('KgeqCO2 / m2.year', 'wpdpeges'); ?></abbr>
</span>
</div>
-
+
</div>
<div class="ges-blank">
- <span class="ges-blank-title"><?php _e( 'GES blank', 'wpdpeges' ); ?></span>
- <span class="ges-blank-legend"><?php _e( 'Non-usable consumption', 'wpdpeges' ); ?></span>
+ <span class="ges-blank-title"><?php _e('GES blank', 'wpdpeges'); ?></span>
+ <span class="ges-blank-legend"><?php _e('Non-usable consumption', 'wpdpeges'); ?></span>
</div>
</figure>
</div>
-</div>
\ No newline at end of file
+</div>
Viewing 1 replies (of 1 total)
Viewing 1 replies (of 1 total)
- The topic ‘Surface < 40m2’ is closed to new replies.