Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

fix(fix-300): Fix QP0 for "chaudières à bois" (constant values) #301

Merged
jgavignet merged 1 commit into from
Jan 8, 2025
Merged

fix(fix-300): Fix QP0 for "chaudières à bois" (constant values) #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/13.2_generateur_combustion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,12 @@ export function tv_generateur_combustion(dpe, di, de, type, GV, tbase, methodeSa
if (![4, 5].includes(methodeSaisie)) {
if (row.qp0_perc) {
const qp0_calc = excel_to_js_exec(row.qp0_perc, di.pn / (de.ratio_virtualisation || 1), E, F);
// Certaines chaudières ont un qp0 en % de pn, d'autres ont des valeurs constantes
di.qp0 = row.qp0_perc.includes('Pn')
? qp0_calc * 1000 * (de.ratio_virtualisation || 1)
: qp0_calc * di.pn;
: row.qp0_perc.includes('%')
? qp0_calc * di.pn
: qp0_calc * 1000;
} else {
di.qp0 = 0;
}
Expand Down
4 changes: 0 additions & 4 deletions src/core/assets/domain/synchronize-valeur-tables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ export class SynchronizeValeurTables {
},
(value, key) => {
if (typeof value === 'string') {
// ALl value that ends with '%' are replace by value to be compatible with the legacy `tv.js` file
if (value.endsWith('%')) {
return `${parseFloat(value.replace('%', '')) / 100}`;
}
// Remove 'kW' to be compatible with the legacy `tv.js` file
if (value.endsWith('kW')) {
return value.replace(/kW/g, '').replace(/\s/g, '');
Expand Down
66 changes: 33 additions & 33 deletions src/tv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24901,7 +24901,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.04',
qp0_perc: '4%',
pveil: '240'
},
{
Expand All @@ -24912,7 +24912,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.02',
qp0_perc: '2%',
pveil: '150'
},
{
Expand All @@ -24923,7 +24923,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.015',
qp0_perc: '1.50%',
pveil: '150'
},
{
Expand All @@ -24934,7 +24934,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.012',
qp0_perc: '1.20%',
pveil: '120'
},
{
Expand All @@ -24945,7 +24945,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '6',
Expand All @@ -24965,7 +24965,7 @@ export const tvs = {
pn: 'Pn',
rpn: '87,5 + 1,5logPn',
rpint: '87,5 + 1,5logPn',
qp0_perc: '0.012',
qp0_perc: '1.20%',
pveil: '120'
},
{
Expand All @@ -24976,7 +24976,7 @@ export const tvs = {
pn: 'Pn',
rpn: '87,5 + 1,5logPn',
rpint: '87,5 + 1,5logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '9',
Expand All @@ -24996,7 +24996,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + logPn',
rpint: '97 + logPn',
qp0_perc: '0.01',
qp0_perc: '1%',
pveil: '150'
},
{
Expand All @@ -25007,7 +25007,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + logPn',
rpint: '97 + logPn',
qp0_perc: '0.01',
qp0_perc: '1%',
pveil: '120'
},
{
Expand All @@ -25018,7 +25018,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + logPn',
rpint: '97 + logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '13',
Expand All @@ -25029,7 +25029,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + 3 logPn',
rpint: '103 + 2,5logPn',
qp0_perc: '0.005'
qp0_perc: '0.50%'
},
{
tv_generateur_combustion_id: '14',
Expand All @@ -25040,7 +25040,7 @@ export const tvs = {
pn: 'Pn',
rpn: '94 + logPn',
rpint: '105 + 0,5logPn',
qp0_perc: '0.003'
qp0_perc: '0.30%'
},
{
tv_generateur_combustion_id: '15',
Expand All @@ -25051,7 +25051,7 @@ export const tvs = {
pn: '400',
rpn: '96.6',
rpint: '106.3',
qp0_perc: '0.003'
qp0_perc: '0.30%'
},
{
tv_generateur_combustion_id: '16',
Expand All @@ -25061,7 +25061,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.04'
qp0_perc: '4%'
},
{
tv_generateur_combustion_id: '17',
Expand All @@ -25071,7 +25071,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.03'
qp0_perc: '3%'
},
{
tv_generateur_combustion_id: '18',
Expand All @@ -25081,7 +25081,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.02'
qp0_perc: '2%'
},
{
tv_generateur_combustion_id: '19',
Expand All @@ -25091,7 +25091,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '20',
Expand All @@ -25101,7 +25101,7 @@ export const tvs = {
pn: 'Pn',
rpn: '84 + 2 logPn',
rpint: '80 + 3 logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '21',
Expand All @@ -25121,7 +25121,7 @@ export const tvs = {
pn: 'Pn',
rpn: '87,5 + 1,5 logPn',
rpint: '87,5 + 1,5 logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '23',
Expand All @@ -25141,7 +25141,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + logPn',
rpint: '97 + logPn',
qp0_perc: '0.01'
qp0_perc: '1%'
},
{
tv_generateur_combustion_id: '25',
Expand All @@ -25152,7 +25152,7 @@ export const tvs = {
pn: 'Pn',
rpn: '91 + 3 logPn',
rpint: '98 + 3 logPn',
qp0_perc: '0.005'
qp0_perc: '0.50%'
},
{
tv_generateur_combustion_id: '26',
Expand All @@ -25163,7 +25163,7 @@ export const tvs = {
pn: 'Pn',
rpn: '94 + logPn',
rpint: '100 + logPn',
qp0_perc: '0.006'
qp0_perc: '0.60%'
},
{
tv_generateur_combustion_id: '27',
Expand All @@ -25174,7 +25174,7 @@ export const tvs = {
pn: '400',
rpn: '96.6',
rpint: '102.6',
qp0_perc: '0.003'
qp0_perc: '0.30%'
},
{
tv_generateur_combustion_id: '28',
Expand Down Expand Up @@ -25738,7 +25738,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée avant 1980',
critere_pn: 'Pn≤10',
rpn: '70',
qp0_perc: '0.04',
qp0_perc: '4.0 %',
pveil: '150'
},
{
Expand All @@ -25747,7 +25747,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 1981-1989',
critere_pn: 'Pn≤10',
rpn: '75',
qp0_perc: '0.02',
qp0_perc: '2.0 %',
pveil: '120'
},
{
Expand All @@ -25756,7 +25756,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 1990-2000',
critere_pn: 'Pn≤10',
rpn: '81',
qp0_perc: '0.012',
qp0_perc: '1.2 %',
pveil: '120'
},
{
Expand All @@ -25765,7 +25765,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 2001-2015',
critere_pn: 'Pn≤10',
rpn: '82',
qp0_perc: '0.01',
qp0_perc: '1.0 %',
pveil: '100'
},
{
Expand All @@ -25774,15 +25774,15 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée après 2015',
critere_pn: 'Pn≤10',
rpn: '82',
qp0_perc: '0.01'
qp0_perc: '1.0 %'
},
{
tv_generateur_combustion_id: '89',
enum_type_generateur_ecs_id: '63|110',
type_generateur: 'Chauffe-eau gaz à production instantanée avant 1980',
critere_pn: 'Pn>10',
rpn: '70',
qp0_perc: '0.04',
qp0_perc: '4.0 %',
pveil: '150'
},
{
Expand All @@ -25791,7 +25791,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 1981-1989',
critere_pn: 'Pn>10',
rpn: '75',
qp0_perc: '0.02',
qp0_perc: '2.0 %',
pveil: '120'
},
{
Expand All @@ -25800,7 +25800,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 1990-2000',
critere_pn: 'Pn>10',
rpn: '82',
qp0_perc: '0.012',
qp0_perc: '1.2 %',
pveil: '120'
},
{
Expand All @@ -25809,7 +25809,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée 2001-2015',
critere_pn: 'Pn>10',
rpn: '84',
qp0_perc: '0.01',
qp0_perc: '1.0 %',
pveil: '100'
},
{
Expand All @@ -25818,7 +25818,7 @@ export const tvs = {
type_generateur: 'Chauffe-eau gaz à production instantanée après 2015',
critere_pn: 'Pn>10',
rpn: '84',
qp0_perc: '0.006'
qp0_perc: '0.6 %'
}
],
pertes_stockage: [
Expand Down
3 changes: 2 additions & 1 deletion test/corpus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,5 +192,6 @@
"2395E2435060X",
"2438E4094489Y",
"2159E1018555M",
"2269E1217015Z"
"2269E1217015Z",
"2374E2700849T"
]
Loading