pmeunier/grain - Change BH23G7KVGRV5KI7T24OONO3BQGWIOOORIBGEJSZQ2MUECZNO6T3QC

Changer le type du JSON pour avoir un style uniforme avec le backend

Created by pmeunier on July 12, 2024

BH23G7KVGRV5KI7T24OONO3BQGWIOOORIBGEJSZQ2MUECZNO6T3QC

Dependencies

In channels

main

Change contents

Replacement in src/routes/projet/[id]/expert/+page.svelte at line 7 [2.35959]
B:BD[2.36119] → [2.36119:36173]
```
    const inflationElec = _simulation.p.inflationElec
```
[2.36119]
[2.36173]
```
    const inflationElec = _simulation.p.inflation_elec
```
Replacement in src/routes/projet/[id]/expert/+page.svelte at line 12 [2.35959]
B:BD[2.36351] → [2.36351:36395]
```
    const tauxDSRA = _simulation.p.tauxDSRA
```
[2.36351]
[2.36395]
```
    const tauxDSRA = _simulation.p.taux_dsra
```
Replacement in src/routes/projet/[id]/calcul.ts at line 64 [2.52957]
B:BD[2.54821] → [2.54821:54872]
```
      [this.p.tarifCRE, this.p.puissance, this.N],
```
[2.54821]
[2.54872]
```
      [this.p.tarif_cre, this.p.puissance, this.N],
```

Replacement in src/routes/projet/[id]/calcul.ts at line 114 [2.52957]

B:BD[2.56255] → [2.56255:56310]

      [this.p.coutElec, this.p.inflationElec, this.N],

[2.56255]

[2.56310]

      [this.p.cout_elec, this.p.inflation_elec, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 151 [2.52957]

B:BD[2.57500] → [2.57500:57632]

      [this.p.puissance, this.p.turpe, this.p.autoconso, this.productionAnnuelle, this.p.turpeInjection, this.p.inflation, this.N],

[2.57500]

[2.57632]

      [this.p.puissance, this.p.turpe, this.p.autoconso, this.productionAnnuelle, this.p.turpe_injection, this.p.inflation, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 217 [2.52957]

B:BD[2.59664] → [2.59664:59781]

      [this.investissement, this.p.fraisDivers, this.exploitation, this.turpe, this.assurance, this.divers, this.N],

[2.59664]

[2.59781]

      [this.investissement, this.p.frais_divers, this.exploitation, this.turpe, this.assurance, this.divers, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 247 [2.52957]

B:BD[2.60679] → [2.60679:60743]

      [this.p.dureeAmortissement, this.investissement, this.N],

[2.60679]

[2.60743]

      [this.p.duree_amortissement, this.investissement, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 266 [2.52957]

B:BD[2.61208] → [2.61208:61287]

      [this.p.puissance, this.p.provisionOnduleurs, this.p.inflation, this.N],

[2.61208]

[2.61287]

      [this.p.puissance, this.p.provision_onduleurs, this.p.inflation, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 303 [2.52957]

B:BD[2.62329] → [2.62329:62381]

      [this.p.puissance, this.p.ratioDcAc, this.N],

[2.62329]

[2.62381]

        [this.p.puissance, this.p.ratio_dc_ac, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 372 [2.52957]

B:BD[2.64051] → [2.64051:64110]

      [this.interetsDetteSenior, this.p.tauxDSRA, this.N],

[2.64051]

[2.64110]

      [this.interetsDetteSenior, this.p.taux_dsra, this.N],

Replacement in src/routes/projet/[id]/calcul.ts at line 402 [2.52957]
B:BD[2.64930] → [2.64930:64982]
```
      [this.resultatFiscal, this.p.tauxIS, this.N],
```
[2.64930]
[2.64982]
```
      [this.resultatFiscal, this.p.taux_is, this.N],
```

Replacement in src/routes/projet/[id]/+page.svelte at line 33 [4.804604]

B:BD[2.81512] → [2.81512:81611]

    const _coutElec = _simulation.p.coutElec
    const inflationElec = _simulation.p.inflationElec

[2.81512]

[2.81611]

    const _coutElec = _simulation.p.cout_elec
    const inflationElec = _simulation.p.inflation_elec

Replacement in src/routes/projet/[id]/+page.svelte at line 39 [4.804604]

B:BD[2.81801] → [2.81801:81864]

    const _consoMoyenneFoyer = _simulation.p.consoMoyenneFoyer

[2.81801]

[5.0]

    const _consoMoyenneFoyer = _simulation.p.conso_moyenne_foyer

Replacement in src/routes/projet/[id]/+layout.svelte at line 129 [2.95670]
B:BD[2.99048] → [2.99048:99088]
```
    const cout = simulation?.p.coutElec
```
[2.99048]
[2.99088]
```
    const cout = simulation?.p.cout_elec
```
Replacement in src/grain-types.ts at line 7 [4.859511]
B:BD[6.138844] → [6.138844:138872]
```
        fraisDivers: number
```
[6.138844]
[6.138872]
```
        frais_divers: number
```
Replacement in src/grain-types.ts at line 12 [4.859511]
B:BD[6.138966] → [6.138966:139000]
```
        consoMoyenneFoyer: number
```
[6.138966]
[6.139000]
```
        conso_moyenne_foyer: number
```
Replacement in src/grain-types.ts at line 18 [4.859511]
∅:D[6.139127] → [4.859952:859972]
B:BD[4.859952] → [4.859952:859972]
```
        tarifCRE: {
```
[6.139127]
[6.139128]
```
        tarif_cre: {
```

Replacement in src/grain-types.ts at line 23 [4.859511]

B:BD[6.139225] → [6.139225:139280]

        coutElec: number
        inflationElec: number

[6.139225]

[6.139280]

        cout_elec: number
        inflation_elec: number

Replacement in src/grain-types.ts at line 27 [4.859511]

B:BD[6.139330] → [6.139330:139396]

        turpeInjection: number
        provisionOnduleurs: number

[6.139330]

[6.139396]

        turpe_injection: number
        provision_onduleurs: number

Replacement in src/grain-types.ts at line 31 [4.859511]

B:BD[6.139445] → [6.139445:139554]

        ratioDcAc: number
        dureeAmortissement: number
        tauxIS: number
        tauxDSRA: number

[6.139445]

[4.860414]

        ratio_dc_ac: number
        duree_amortissement: number
        taux_is: number
        taux_dsra: number

Replacement in src/grain-types.ts at line 42 [4.859511]
∅:D[7.49] → [4.860588:860619]
∅:D[8.16077] → [4.860588:860619]
∅:D[9.41281] → [4.860588:860619]
B:BD[4.860588] → [4.860588:860619]
```
            fraisDivers: 1000,
```
[8.16077]
[8.16078]
```
            frais_divers: 1000,
```

Replacement in src/grain-types.ts at line 47 [4.859511]

B:BD[10.41712] → [6.139555:139601]

            consoMoyenneFoyer: 2500, //Kwh/an

[10.41712]

[4.860762]

            conso_moyenne_foyer: 2500, //Kwh/an

Replacement in src/grain-types.ts at line 53 [4.859511]
B:BD[4.860909] → [4.860909:860933]
```
            tarifCRE: {
```
[4.860909]
[4.860933]
```
            tarif_cre: {
```

Replacement in src/grain-types.ts at line 58 [4.859511]

B:BD[4.861064] → [9.41423:41458]

B:BD[9.41458] → [3.0:35]

            coutElec: 0.24, // €
            inflationElec: 3, // %

[4.861064]

[4.861137]

            cout_elec: 0.24, // €
            inflation_elec: 3, // %

Replacement in src/grain-types.ts at line 62 [4.859511]

B:BD[4.861210] → [4.861210:861246]

B:BD[4.861246] → [6.139602:139649]

            turpeInjection: 0.0278,
            provisionOnduleurs: 0.1, // €/Wc

[4.861210]

[4.861294]

            turpe_injection: 0.0278,
            provision_onduleurs: 0.1, // €/Wc

Replacement in src/grain-types.ts at line 66 [4.859511]

B:BD[4.861388] → [4.861388:861537]

            ratioDcAc: 0.8,
            dureeAmortissement: 10, // durée fiscale en années
            tauxIS: 25,
            tauxDSRA: 1.7, // %

[4.861388]

[4.861537]

            ratio_dc_ac: 0.8,
            duree_amortissement: 10, // durée fiscale en années
            taux_is: 25,
            taux_dsra: 1.7, // %

Replacement in src/common.ts at line 8 [11.223]

B:BD[11.442] → [11.442:520]

            p.coutElec *
            Math.pow(1 + p.inflationElec / 100, i) *

[11.442]

[11.520]

            p.cout_elec *
            Math.pow(1 + p.inflation_elec / 100, i) *

Replacement in src/common.ts at line 20 [11.223]

∅:D[2.120814] → [11.799:882]

B:BD[11.799] → [11.799:882]

            (p.coutElec *
                Math.pow(1 + p.inflationElec / 100, i) *

[2.120814]

[11.882]

            (p.cout_elec *
                Math.pow(1 + p.inflation_elec / 100, i) *

Replacement in src/common.ts at line 34 [11.223]

B:BD[11.1374] → [2.120997:121117]

    return Math.min(p.consoMoyenneFoyer, productionAnnuelle(p.productible, p.puissance, p.degradation, i) / p.autoprod)

[11.1374]

[11.1454]

    return Math.min(p.conso_moyenne_foyer, productionAnnuelle(p.productible, p.puissance, p.degradation, i) / p.autoprod)

Changer le type du JSON pour avoir un style uniforme avec le backend

Dependencies

In channels

Change contents

Replacement in src/routes/projet/[id]/expert/+page.svelte at line 7 [2.35959]

Replacement in src/routes/projet/[id]/expert/+page.svelte at line 12 [2.35959]

Replacement in src/routes/projet/[id]/calcul.ts at line 64 [2.52957]