pmeunier/grain - Change LX2ZVNAYX2FRCEIJ6XBCBILB3O7YT52AP56QDWCCGLATFCEB7KHQC

Adaptation au nouveau backend de la version hébergée

Dans la foulée, on peut supprimer l'encodage base64 vu que le stockage des images utilisera des tags <img src=url/> plutôt que des base64

Created by pmeunier on December 9, 2023

LX2ZVNAYX2FRCEIJ6XBCBILB3O7YT52AP56QDWCCGLATFCEB7KHQC

Dependencies

In channels

main

Change contents

File deletion: base64.ts

BF:BFD[6.762577] → [6.865924:865957]

BF:BFD[6.865957] → [6.862654:862654]

B:BD[6.862654] → [6.862655:865923]

const base64abc = [
    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
    "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
    "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "-", "_"
];
const base64codes = [
    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255, 62, 255, 63,
    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, 255, 0, 255, 255,
    255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 255, 255, 255, 255, 63,
    255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
];
function getBase64Code(charCode: number): number {
    if (charCode >= base64codes.length) {
        throw new Error("Unable to parse base64 string.");
    }
    const code = base64codes[charCode];
    if (code === 255) {
        throw new Error("Unable to parse base64 string.");
    }
    return code;
}
export function bytesToBase64(bytes: Uint8Array): string {
    let result = '', i, l = bytes.length;
    for (i = 2; i < l; i += 3) {
        result += base64abc[bytes[i - 2] >> 2];
        result += base64abc[((bytes[i - 2] & 0x03) << 4) | (bytes[i - 1] >> 4)];
        result += base64abc[((bytes[i - 1] & 0x0F) << 2) | (bytes[i] >> 6)];
        result += base64abc[bytes[i] & 0x3F];
    }
    if (i === l + 1) { // 1 octet yet to write
        result += base64abc[bytes[i - 2] >> 2];
        result += base64abc[(bytes[i - 2] & 0x03) << 4];
        result += "==";
    }
    if (i === l) { // 2 octets yet to write
        result += base64abc[bytes[i - 2] >> 2];
        result += base64abc[((bytes[i - 2] & 0x03) << 4) | (bytes[i - 1] >> 4)];
        result += base64abc[(bytes[i - 1] & 0x0F) << 2];
        result += "=";
    }
    return result;
}
export function base64ToBytes(str: string): Uint8Array {
    if (str.length % 4 !== 0) {
        throw new Error("Unable to parse base64 string.");
    }
    const index = str.indexOf("=");
    if (index !== -1 && index < str.length - 2) {
        throw new Error("Unable to parse base64 string.");
    }
    let missingOctets = str.endsWith("==") ? 2 : str.endsWith("=") ? 1 : 0,
        n = str.length,
        result = new Uint8Array(3 * (n / 4)),
        buffer;
    for (let i = 0, j = 0; i < n; i += 4, j += 3) {
        buffer =
            getBase64Code(str.charCodeAt(i)) << 18 |
            getBase64Code(str.charCodeAt(i + 1)) << 12 |
            getBase64Code(str.charCodeAt(i + 2)) << 6 |
            getBase64Code(str.charCodeAt(i + 3));
        result[j] = buffer >> 16;
        result[j + 1] = (buffer >> 8) & 0xFF;
        result[j + 2] = buffer & 0xFF;
    }
    return result.subarray(0, result.length - missingOctets);
}
export function base64encode(str: Uint8Array): string {
    return bytesToBase64(str);
}
export function base64decode(str: string, decoder = new TextDecoder()): Uint8Array {
    return base64ToBytes(str)
}

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 4 [6.784923]
∅:D[7.25967] → [6.785023:785072]
B:BD[6.785023] → [6.785023:785072]
```
 import { base64decode } from '../../../base64';
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 9 [6.784923]

∅:D[3.41] → [6.785208:785270]

B:BD[6.785208] → [6.785208:785270]

 export let prms: string = ""
 export let active: string = ""

[3.41]

[8.0]

 type Prm = { prm: number | null, nom: string, prenom: string }
     export let prms: Prm [] = []

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 14 [6.784923]

[7.26027]

 let consentement = false
 function addPrm(_ev: Event) {
     prms.push({ prm: null, nom: '', prenom: '' })
     consentement = false
     prms = prms
 }
 function delPrm(_ev: Event, i: number) {
     prms.splice(i, 1)
     prms = prms
 }

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 43 [6.784923]
B:BD[6.785374] → [6.785374:785456]
B:BD[6.785456] → [7.26274:26275]
```
 let srv = import.meta.env.MODE == 'production' ? 'coturnix.fr' : 'd.coturnix.fr'
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 169 [6.784923]
B:BD[6.786631] → [6.786631:786673]
```
 let annee: Record<string, string[]> = {}
```
[6.786631]
[6.786673]
```
 let annee: Record<number, number[]> = {}
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 174 [6.784923]
B:BD[6.786792] → [6.786792:786857]
```
         let f = new FormData()
         f.append("prms", prms);
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 176 [6.784923]

∅:D[7.26542] → [6.786857:786890]

B:BD[6.786857] → [6.786857:786890]

B:BD[6.786890] → [3.547:588]

∅:D[3.588] → [6.786932:787000]

B:BD[6.786932] → [6.786932:787000]

         let resp = await fetch(
             `https://${srv}/api/grain`,
             { method: "POST",
             body: f
             })

[7.26542]

[6.787000]

         const srv = import.meta.env.MODE == 'production' ? 'https://x.coturnix.fr' : 'http://localhost:5173'
         const resp = await fetch(
             `${srv}/api/grain/prms`, {
                 method: "POST",
                 body: JSON.stringify(prms)
             }
         )

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 323 [6.784923]
∅:D[3.805] → [6.788065:788066]
B:BD[6.788065] → [6.788065:788066]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 328 [6.784923]

B:BD[6.788268] → [6.788268:788279]

B:BD[6.788279] → [3.867:891]

∅:D[3.891] → [6.788279:788480]

B:BD[6.788279] → [6.788279:788480]

B:BD[6.788480] → [3.892:1122]

∅:D[3.1122] → [6.788649:788668]

B:BD[6.788649] → [6.788649:788668]

B:BD[6.788668] → [3.1123:1214]

∅:D[3.1214] → [6.788810:788825]

B:BD[6.788810] → [6.788810:788825]

         }
         let t = min_t;
         for(let semaine of r) {
             let b = new DataView(base64decode(semaine).buffer)
             let length = b.getUint32(0, true)
             for(let i = 8; i < 8 + 8 * length; i+= 8) {
                 const ti = b.getUint32(i, true)
                 const vi = b.getUint32(i+4, true)
                 for(let tt = t + 1800; tt < ti; tt += 1800) {
                     d.t.push(tt)
                     d.y.push(0)
                 }
                 t = ti
                 d.t.push(ti)
                 d.y.push(vi / 1000)
             }

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 329 [6.784923]

B:BD[3.1226] → [3.1226:1335]

         for(let tt = t + 1800; tt < max_t; tt += 1800) {
             d.t.push(tt)
             d.y.push(0)

[3.1226]

[6.788825]

         let i = 0;
         for(let t = min_t; t < max_t; t += 1800) {
             d.t.push(t);
             d.y.push(r[i] / 1000);
             i += 1

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 377 [6.784923]
B:BD[7.28202] → [3.1434:1474]
```
             let tt = new Date(t*1000);
```
[7.28202]
[7.28242]
```
         let tt = new Date(t*1000);
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 414 [6.784923]
B:BD[6.792821] → [7.30232:30295]
∅:D[7.30295] → [9.354970:354995]
B:BD[6.792846] → [9.354970:354995]
```
     if(max_t > min_t || !initialised) {
         await tick()
         redraw()
     }
```
[6.792821]
[9.354995]
```
     await tick()
     redraw()
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 554 [6.784923]
[3.2903]
[3.2903]
```
         //@ts-ignore
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 612 [6.784923]
[7.32334]
[3.3010]
```
<h2 class="my-5">Profils de consommation</h2>
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 614 [6.784923]

∅:D[3.3026] → [9.359151:359173]

∅:D[7.32334] → [9.359151:359173]

B:BD[6.793908] → [9.359151:359173]

B:BD[9.359173] → [3.3027:3136]

∅:D[3.3136] → [9.359173:359268]

B:BD[9.359173] → [9.359173:359268]

B:BD[9.359268] → [7.32335:32444]

B:BD[7.32444] → [10.0:62]

∅:D[10.62] → [9.359371:359515]

B:BD[9.359371] → [9.359371:359515]

B:BD[9.359515] → [7.32445:32631]

∅:D[7.32631] → [9.359639:359657]

B:BD[9.359639] → [9.359639:359657]

B:BD[9.359657] → [8.3631:3702]

∅:D[8.3702] → [7.32632:32760]

B:BD[9.359711] → [7.32632:32760]

∅:D[7.32760] → [9.359829:359873]

B:BD[9.359829] → [9.359829:359873]

B:BD[6.794348] → [6.794348:794357]

<table class="table">
    <thead>
        <tr><th></th><th>Profil</th><th>Consommation annuelle</th></tr>
    </thead>
    <tbody>
    {#each pr as pr, i}
        <tr>
            <td class="px-3">Profil</td>
            <td>
                <select class="form-select" bind:value={pr.type} on:change={(_ev) => updatePlot(puissance)}>
                    {#each Object.entries(profils) as [p, _]}
                        <option value={p}>{p}</option>
                    {/each}
                </select>
            </td>
            <td>
                <input type="number" class="form-control" placeholder="Consommation Annuelle (kWh)" min="0" step="500" bind:value={pr.conso} on:change={(_ev) => updatePlot(puissance)}/>
            </td>
            <td style="width:1%;white-space:nowrap;text-align:center">
                <button class="btn btn-link" on:click={(_ev) => delProfil(i)}><i class="bi bi-x-circle text-primary"/></button>
            </td>
        </tr>
    {/each}
</table>

[3.3026]

[3.3137]

    <table class="table">
        <thead><tr><th></th><th>Profil</th><th>Consommation annuelle</th><th></th></tr></thead>
        <tbody>
            {#each pr as pr, i}
                <tr>
                    <td class="px-3 align-middle">Profil</td>
                    <td>
                        <select class="form-select" bind:value={pr.type} on:change={(_ev) => updatePlot(puissance)}>
                            {#each Object.entries(profils) as [p, _]}
                                <option value={p}>{p}</option>
                            {/each}
                        </select>
                    </td>
                    <td>
                        <input type="number" class="form-control" placeholder="Consommation Annuelle (kWh)" min="0" step="500" bind:value={pr.conso} on:change={(_ev) => updatePlot(puissance)}/>
                    </td>
                    <td style="width:1%;white-space:nowrap;text-align:center">
                        <button class="btn btn-link" on:click={(_ev) => delProfil(i)}><i class="bi bi-x-circle text-primary"/></button>
                    </td>
                </tr>
            {/each}
        </tbody>
    </table>

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 638 [6.784923]

[3.3143]

<div class="text-center">
    <button class="btn btn-primary" on:click={addProfil}><i class="bi bi-plus-circle"/>&nbsp;Ajouter un profil</button>
</div>

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 643 [6.784923]

B:BD[3.3161] → [3.3161:3767]

<div class="row">
    <div class="col px-3" style="width: 25%">Liste de PRM, séparés par des virgules
        <button type="button" class="btn btn-link align-baseline p-0 ms-2" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="Un PRM, aussi appelé PDL, est l'identifiant d'un compteur électrique. On peut le trouver sur les factures d'électricité, ou en appuyant sur le bouton + du compteur Linky."><i class="bi bi-question-circle"></i></button>
    </div>
    <div class="col-auto my-3">
        <input class="form-control" form="pdl" id="prms" name="prms" bind:value={prms}/>

[3.3161]

[3.3767]

    <h2 class="my-5">Relevés de compteurs</h2>
    {#if prms.length}
    <table class="table">
        <thead><tr><th>PRM<button type="button" class="btn btn-link align-baseline p-0 ms-2" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="Un PRM, aussi appelé PDL, est l'identifiant d'un compteur électrique. On peut le trouver sur les factures d'électricité, ou en appuyant sur le bouton + du compteur Linky."><i class="bi bi-question-circle"></i></button></th><th>Prénom</th><th>Nom</th><th></th></tr></thead>
        <tbody>
            {#each prms as prm, i}
                <tr>
                    <td><input class="form-control" bind:value={prm.prm} type="number" /></td>
                    <td><input class="form-control" bind:value={prm.nom}/></td>
                    <td><input class="form-control" bind:value={prm.prenom}/></td>
                    <td style="width:1%;white-space:nowrap;text-align:center">
                        <button class="btn btn-link" on:click={(ev) => delPrm(ev, i)}><i class="bi bi-x-circle text-primary"/></button>
                    </td>
                </tr>
            {/each}
        </tbody>
    </table>
    <div class="my-3 form-check">
        <input class="form-check-input" type="checkbox" id="consentement" bind:checked={consentement}>
        <label class="form-check-label" for="consentement">Ces abonnés consentent à ce que j'accède à leurs données</label>

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 664 [6.784923]

B:BD[3.3778] → [3.3778:3980]

    <div class="col d-flex align-items-center">
        <button class="btn btn-primary" form="pdl">Ok</button>
        {#if prm_loading}
            <div class="spinner-border text-primary ms-3"></div>

[3.3778]

[3.3980]

    {/if}
    <div class="d-flex justify-content-center">
        <button class="mx-2 btn btn-primary" on:click={addPrm}><i class="bi bi-plus-circle"/>&nbsp;Ajouter un compteur</button>
        {#if prms.length}
            <button disabled={!consentement} class="mx-2 btn btn-primary" form="pdl">Mettre à jour</button>
            <div class="mx-2 spinner-border text-primary" class:d-none={!prm_loading}></div>

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 672 [6.784923]
B:BD[3.4005] → [3.4005:4012]
```
</div>
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 673 [6.784923]
∅:D[3.4018] → [9.360075:360106]
B:BD[6.794358] → [9.360075:360106]
B:BD[9.360106] → [3.4019:4139]
∅:D[10.177] → [9.360287:360294]
∅:D[3.4139] → [9.360287:360294]
B:BD[9.360287] → [9.360287:360294]
```
<div class="my-5 text-center">
    <button class="btn btn-primary" on:click={addProfil}><i class="bi bi-plus-circle"/>&nbsp;Ajouter un profil</button>
</div>
```
[3.4018]
[7.33680]
```
<h2 class="mt-5">Simulation</h2>
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 8 [6.804604]

B:BD[11.292] → [11.292:392]

B:BD[11.392] → [4.131:173]

B:BD[4.173] → [4.173:174]

  import type { Grain } from '../../../helpers'
  import type { Modal, Offcanvas } from 'bootstrap'
  import { email } from '../../../stores'

[11.292]

[4.174]

 import type { Grain } from '../../../helpers'
 import * as H from '../../../helpers'
 import type { Modal, Offcanvas } from 'bootstrap'
 import { email } from '../../../stores'

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 13 [6.804604]

B:BD[4.215] → [4.215:235]

∅:D[4.235] → [11.413:651]

B:BD[11.413] → [11.413:651]

 export let data: {
      name: string,
      porteur: string,
      adresse: string,
      tel: string,
      id: string,
      img?: string,
      simulation: Grain.SimulationCommunaute,
      guest?: boolean,
      prms: string,
      email?: string,
  }

[4.215]

[6.805016]


 type Prm = { prm: number | null, nom: string, prenom: string }
     export let data: {
         nom: string,
         porteur: string,
         adresse: string,
         tel: string,
         id: string,
         img?: string,
         simulation: Grain.SimulationCommunaute,
         guest?: boolean,
         prms: Prm[],
         email?: string,
     }

Insertion in grain/src/routes/projet/[id]/+page.svelte at line 39 [6.804604]
[4.272]
[11.781]
```
      email.subscribe((value) => { if(value) data.email = value })
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 129 [6.804604]

B:BD[6.806263] → [11.3625:3706]

  $: investissement = p.puissance ? (p.puissance * 1000 * p.ratio + p.enedis): 0

[6.806263]

[6.806311]

 $: investissement = p.puissance ? (p.puissance * 1000 * p.ratio + p.enedis): 0

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 131 [6.804604]
B:BD[6.806312] → [11.3707:3756]
```
  $: apport = Math.min(investissement, p.apport)
```
[6.806312]
[6.806460]
```
 $: apport = Math.min(investissement, p.apport)
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 133 [6.804604]

B:BD[6.806461] → [11.3757:3909]

  $: primeInvestissement =
      (p.puissance <= 36) ? (0.21 * 1000 * p.puissance) :
      (p.puissance <= 100) ? (0.11 * 1000 * p.puissance) :
      0

[6.806461]

[6.806566]

 $: primeInvestissement =
     (p.puissance <= 36) ? (0.21 * 1000 * p.puissance) :
     (p.puissance <= 100) ? (0.11 * 1000 * p.puissance) :
     0

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 138 [6.804604]

B:BD[6.806567] → [11.3910:4016]

  $: productionAnnuelle = (i: number) => p.productible * p.puissance * Math.pow(1-(p.degradation)/100, i)

[6.806567]

[6.806601]

 $: productionAnnuelle = (i: number) => H.productionAnnuelle(p, i)

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 140 [6.804604]
B:BD[6.806602] → [11.4017:4052]
```
  $: autoconso = p.autoconso / 100
```
[6.806602]
[6.806705]
```
 $: autoconso = p.autoconso / 100
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 142 [6.804604]

B:BD[6.806706] → [11.4053:4157]

  $: tarifSurplus = (i: number) => tarifSurplus_(p.puissance) * Math.pow(1+p.tarifCRE.inflation/100, i)

[6.806706]

[6.806945]

 $: tarifSurplus = (i: number) => tarifSurplus_(p.puissance) * Math.pow(1+p.tarifCRE.inflation/100, i)

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 144 [6.804604]

B:BD[6.806946] → [11.4158:4311]

  $: tarifLocal = (i: number) => p.prix * Math.pow(1+p.inflation/100, i)
  $: tarifAllo = (i: number) => p.coutElec * Math.pow(1+p.inflationElec/100, i)

[6.806946]

 $: tarifLocal = (i: number) => H.tarifLocal(p, i)
 $: tarifAllo = (i: number) => p.coutElec * Math.pow(1+p.inflationElec/100, i)

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 194 [6.804604]

B:BD[6.808711] → [11.6301:6370]

  $: tresorerieDisponibleDetteSenior = (i: number) => ebe(i) - is(i)

[6.808711]

[6.808835]


 $: tresorerieDisponibleDetteSenior = (i: number) => ebe(i) - is(i)

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 214 [6.804604]

B:BD[11.7128] → [11.7128:7233]

  $: consoMoyenneFoyer = (i: number) => Math.min(p.consoMoyenneFoyer, productionAnnuelle(i)/p.autoprod )

[11.7128]

[6.810082]

  $: consoMoyenneFoyer = (i: number) => H.consoMoyenneFoyer(p, i)

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 234 [6.804604]
B:BD[12.1148] → [11.7744:7772]
```
  $: coutElec_ = coutElec()
```
[12.1148]
[11.7772]
```
 $: coutElec_ = coutElec()
```
Replacement in grain/src/routes/projet/[id]/+page.svelte at line 236 [6.804604]
B:BD[11.7773] → [11.7773:7809]
```
  $: coutElecAuto_ = coutElecAuto()
```
[11.7773]
[11.7809]
```
 $: coutElecAuto_ = coutElecAuto()
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 335 [6.804604]

∅:D[12.3979] → [7.35043:35075]

B:BD[7.35043] → [7.35043:35075]

B:BD[7.35075] → [12.3980:4034]

                {#if data.name}
                    <h1 class="my-0">{data.name}</h1>

[12.3979]

[6.811829]

                {#if data.nom}
                    <h1 class="my-0">{data.nom}</h1>

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 344 [6.804604]

B:BD[12.4274] → [12.4274:4355]

                    {#if data.name}
                        <h1>{data.name}</h1>

[12.4274]

[12.4355]

                    {#if data.nom}
                        <h1>{data.nom}</h1>

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 810 [6.804604]

B:BD[11.10636] → [4.273:487]

                    <Simulation prmsFeature={prmsFeature} active={simuActive} bind:prms={data.prms} puissance={p.puissance} bind:prodWeekly={prodWeekly} bind:maxProd={maxProd} bind:pvgis_loading={pvgis_loading} />

[11.10636]

[9.367722]

                    <Simulation prmsFeature={prmsFeature} bind:prms={data.prms} puissance={p.puissance} bind:prodWeekly={prodWeekly} bind:maxProd={maxProd} bind:pvgis_loading={pvgis_loading} />

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 824 [6.804604]

B:BD[11.11191] → [11.11191:11314]

                            <input class="form-control" type="text" id="nom" name="name" bind:value={data.name} required/>

[11.11191]

[11.11314]

                            <input class="form-control" type="text" id="nom" name="nom" bind:value={data.nom} required/>

Replacement in grain/src/routes/projet/[id]/+page.server.ts at line 1 [6.837658]

B:BD[6.837658] → [6.837659:837708]

B:BD[6.837708] → [11.12771:12841]

B:BD[11.12841] → [2.0:86]

∅:D[2.86] → [6.837840:837874]

∅:D[13.391] → [6.837840:837874]

∅:D[11.12916] → [6.837840:837874]

B:BD[6.837840] → [6.837840:837874]

B:BD[6.837874] → [6.837874:837922]

import { error, redirect } from '@sveltejs/kit';
import type { PageServerLoad, Actions, RouteParams } from './$types';
import { userForm,  SimulationCommunaute, Grain, save, del } from '../../../helpers';
import { base } from '$app/paths'
import { base64encode } from '../../../base64';

[6.837658]

[6.837922]

import { error } from '@sveltejs/kit';
import type { PageServerLoad, Actions } from './$types';
import { userForm,  Grain, save, del } from '../../../helpers';

Replacement in grain/src/routes/projet/[id]/+page.server.ts at line 14 [6.837658]
∅:D[13.504] → [6.838223:838245]
B:BD[6.838223] → [6.838223:838245]
```
            name: "",
```
[13.504]
[6.838245]
```
            nom: "",
```

Deletion in grain/src/routes/projet/[id]/+page.server.ts at line 35 [6.837658]

B:BD[6.838790] → [6.838790:838890]

        if(img?.value) {
            projet.img = base64encode(new Uint8Array(img.value))
        }

Replacement in grain/src/routes/Donnees.svelte at line 23 [5.39]

B:BD[5.946] → [5.946:1092]

                    <div class="pb-3 mb-3 border-bottom border-4 border-primary fs-1 fw-bold bg-cc fs-1 fw-bold">+ {donnees.economies} k€</div>

[5.946]

[5.1092]

                    <div class="pb-3 mb-3 border-bottom border-4 border-primary fs-1 fw-bold bg-cc fs-1 fw-bold">+{Math.round(donnees.economies / 1000)}k€</div>

Replacement in grain/src/routes/+page.svelte at line 26 [6.855919]

B:BD[14.406] → [14.406:447]

                                {p.name}

[14.406]

[14.447]

                                {p.nom}

Insertion in grain/src/helpers.ts at line 1 [6.858205]

[6.858205]

[6.858206]

import { error, redirect } from '@sveltejs/kit';
import { base } from '$app/paths';

Insertion in grain/src/helpers.ts at line 10 [6.858205]
[13.781]
[6.858348]
```
import { SimulationCommunaute } from './simulation_communaute.js'
```
Replacement in grain/src/helpers.ts at line 37 [6.858205]
B:BD[2.143] → [2.143:168]
```
    params: RouteParams,
```
[2.143]
[2.168]
```
    params: { id?: string },
```
Replacement in grain/src/helpers.ts at line 71 [6.858205]
B:BD[2.1119] → [2.1119:1132]
```
    } else {
```
[2.1119]
[2.1132]
```
    } else if(params['id']) {
```
Replacement in grain/src/helpers.ts at line 75 [6.858205]
B:BD[2.1229] → [2.1229:1263]
```
                id: params['id'],
```
[2.1229]
[2.1263]
```
                id: pid,
```
Replacement in grain/src/helpers.ts at line 104 [6.858205]
B:BD[2.1935] → [2.1935:1960]
```
    params: RouteParams,
```
[2.1935]
[2.1960]
```
    params: { id?: string },
```

Replacement in grain/src/helpers.ts at line 107 [6.858205]

B:BD[2.2001] → [2.2001:2144]

    await userForm(platform.env, id_, {
        DelProjet: {
            id: params['id'],
        }
    })
    throw redirect(302, `${base}`)

[2.2001]

[2.2144]

    if(params.id) {
        await userForm(platform.env, id_, {
            DelProjet: {
                id: params['id'],
            }
        })
        throw redirect(302, `${base}`)
    }
}
export function coutElec(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout += p.coutElec * Math.pow(1 + p.inflationElec / 100, i) * consoMoyenneFoyer(p, i)
    }
    return cout
}
export function coutElecAuto(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout += tarifLocal(p, i) * consoMoyenneFoyer(p, i) * p.autoprod / 100
            + p.coutElec * Math.pow(1 + p.inflationElec / 100, i) * consoMoyenneFoyer(p, i) * (100 - p.autoprod) / 100
    }
    return cout
}
export function tarifLocal(p: Grain.SimulationCommunaute, i: number) {
    return p.prix * Math.pow(1+p.inflation/100, i)
}
export function productionAnnuelle(p: Grain.SimulationCommunaute, i: number){
    return p.productible * p.puissance * Math.pow(1-(p.degradation)/100, i)

Insertion in grain/src/helpers.ts at line 142 [6.858205]

[2.2146]


export function consoMoyenneFoyer(p: Grain.SimulationCommunaute, i: number) {
    return Math.min(p.consoMoyenneFoyer, productionAnnuelle(p, i)/p.autoprod)
}

Adaptation au nouveau backend de la version hébergée

Dependencies

In channels

Change contents

File deletion: base64.ts

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 4 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 9 [6.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 14 [6.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 43 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 169 [6.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 174 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 176 [6.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 323 [6.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 328 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 329 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 377 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 414 [6.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 554 [6.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 612 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 614 [6.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 638 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 643 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 664 [6.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 672 [6.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 673 [6.784923]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 8 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 13 [6.804604]

Insertion in grain/src/routes/projet/[id]/+page.svelte at line 39 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 129 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 131 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 133 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 138 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 140 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 142 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 144 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 194 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 214 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 234 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 236 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 335 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 344 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 810 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 824 [6.804604]

Replacement in grain/src/routes/projet/[id]/+page.server.ts at line 1 [6.837658]

Replacement in grain/src/routes/projet/[id]/+page.server.ts at line 14 [6.837658]

Deletion in grain/src/routes/projet/[id]/+page.server.ts at line 35 [6.837658]

Replacement in grain/src/routes/Donnees.svelte at line 23 [5.39]

Replacement in grain/src/routes/+page.svelte at line 26 [6.855919]

Insertion in grain/src/helpers.ts at line 1 [6.858205]

Insertion in grain/src/helpers.ts at line 10 [6.858205]

Replacement in grain/src/helpers.ts at line 37 [6.858205]

Replacement in grain/src/helpers.ts at line 71 [6.858205]

Replacement in grain/src/helpers.ts at line 75 [6.858205]

Replacement in grain/src/helpers.ts at line 104 [6.858205]

Replacement in grain/src/helpers.ts at line 107 [6.858205]

Insertion in grain/src/helpers.ts at line 142 [6.858205]