pmeunier/grain - Change 5FNNIOUNDS5SG75A4ZR6VY7DS6WU2GNNCOSSHX34RFTRB7LJ3D2QC

Remise en route des PRMs

Created by pmeunier on December 6, 2023

5FNNIOUNDS5SG75A4ZR6VY7DS6WU2GNNCOSSHX34RFTRB7LJ3D2QC

Dependencies

In channels

main

Change contents

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 9 [5.784923]
[5.785169]
[5.785208]
```
 export let prmsFeature: boolean = false
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 26 [5.784923]
B:BD[5.785277] → [5.785277:785312]
```
     console.log("active", active)
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 36 [5.784923]

B:BD[5.785480] → [5.785480:785607]

B:BD[5.785607] → [6.26293:26330]

∅:D[6.26330] → [7.352194:352222]

B:BD[7.352194] → [7.352194:352222]

∅:D[7.352222] → [5.785705:785712]

B:BD[5.785705] → [5.785705:785712]

     console.log("browser", browser)
     if(browser) {
         //@ts-ignore
         Plotly = await import('plotly.js-dist')
         await updatePlot(puissance)
         initialised = true
     }

[5.785480]

[5.785712]

     //@ts-ignore
     Plotly = await import('plotly.js-dist')
     await updatePlot(puissance)
     initialised = true

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 61 [5.784923]
B:BD[2.1] → [2.1:18]
```
 let profils = {
```
[2.1]
[2.18]
```
 let profils: Record<string, { profils: string[]}> = {
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 63 [5.784923]
B:BD[2.48] → [2.48:74]
```
	 "profils":[ "RES1-P1" ]
```
[2.48]
[2.74]
```
         "profils":[ "RES1-P1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 67 [5.784923]
B:BD[2.116] → [2.116:143]
```
	 "profils":[ "RES11-P1" ]
```
[2.116]
[2.143]
```
         "profils":[ "RES11-P1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 71 [5.784923]
B:BD[2.188] → [2.188:211]
```
	 "profils":[ "RES2" ]
```
[2.188]
[2.211]
```
         "profils":[ "RES2" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 75 [5.784923]
B:BD[2.251] → [2.251:277]
```
	 "profils":[ "PRO1-P1" ]
```
[2.251]
[2.277]
```
         "profils":[ "PRO1-P1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 79 [5.784923]
B:BD[2.322] → [2.322:347]
```
	 "profils":[ "PRO1WE" ]
```
[2.322]
[2.347]
```
         "profils":[ "PRO1WE" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 83 [5.784923]
B:BD[2.393] → [2.393:416]
```
	 "profils":[ "PRO2" ]
```
[2.393]
[2.416]
```
         "profils":[ "PRO2" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 87 [5.784923]
B:BD[2.469] → [2.469:492]
```
	 "profils":[ "ENT1" ]
```
[2.469]
[2.492]
```
         "profils":[ "ENT1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 92 [5.784923]
B:BD[2.544] → [2.544:569]
```
	"profils":[ "PRD1-P1" ]
```
[2.544]
[2.569]
```
        "profils":[ "PRD1-P1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 96 [5.784923]
B:BD[2.619] → [2.619:644]
```
	"profils":[ "PRD2-P1" ]
```
[2.619]
[2.644]
```
        "profils":[ "PRD2-P1" ]
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 100 [5.784923]
B:BD[2.695] → [2.695:720]
```
	"profils":[ "PRD3-P1" ]
```
[2.695]
[2.720]
```
        "profils":[ "PRD3-P1" ]
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 156 [5.784923]
B:BD[5.786558] → [3.106:137]
```
     console.log(total, annee)
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 169 [5.784923]
B:BD[5.786890] → [5.786890:786932]
```
             `https://${srv}/api/faisan`,
```
[5.786890]
[5.786932]
```
             `https://${srv}/api/grain`,
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 307 [5.784923]
∅:D[3.1969] → [5.787948:787986]
∅:D[6.27916] → [5.787948:787986]
B:BD[5.787948] → [5.787948:787986]
```
     let min_t = 0
     let max_t = 0
```
[3.1969]
[5.787986]
```
     let annee_ :Record<string, { t: number[], y: number[], i: number }> = {}
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 309 [5.784923]

B:BD[5.787987] → [5.787987:788065]

     let annee_ :Record<string, { t: number[], y: number[], i: number }> = {}

[5.787987]

[5.788065]

     let d = new Date()
     const min_t = (new Date(d.getFullYear(), 0, 1)).getTime() / 1000
     const max_t = min_t + 364 * 24 * 3600

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 314 [5.784923]

B:BD[5.788116] → [5.788116:788189]

         let d: { t: number[], x: string[], y: number[], i: number } = {

[5.788116]

[5.788189]

         let d: { t: number[], y: number[], i: number } = {

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 316 [5.784923]
B:BD[5.788209] → [5.788209:788229]
```
             x: [],
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 319 [5.784923]
[5.788279]
[5.788279]
```
         let t = min_t;
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 324 [5.784923]

B:BD[5.788480] → [5.788480:788649]

                 let t = b.getUint32(i, true)
                 let v = b.getUint32(i+4, true)
                 if(!min_t || t < min_t) {
                     min_t = t

[5.788480]

[5.788649]

                 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)

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 330 [5.784923]

B:BD[5.788668] → [5.788668:788810]

                 if(t > max_t) {
                     max_t = t
                 }
                 d.t.push(t)
                 d.y.push(v)

[5.788668]

[5.788810]

                 t = ti
                 d.t.push(ti)
                 d.y.push(vi / 1000)

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 334 [5.784923]

[5.788825]

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

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 342 [5.784923]

B:BD[5.788869] → [6.27917:28087]

     if(min_t >= max_t) {
         let d = new Date()
         min_t = (new Date(d.getFullYear(), 0, 1)).getTime() / 1000
         max_t = min_t + 364 * 24 * 3600
     }

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 348 [5.784923]
B:BD[7.354139] → [7.354139:354162]
```
                 i: 1,
```
[7.354139]
[7.354162]
```
                 i: 0,
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 377 [5.784923]
[3.2094]
[6.28154]
```
     for(let [_, r] of Object.entries(annee_)) {
         r.i = 0
     }
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 381 [5.784923]
∅:D[6.28202] → [5.790175:790211]
B:BD[5.790175] → [5.790175:790211]
```
         let tt = new Date(t*1000);
```
[6.28202]
[6.28242]
```
             let tt = new Date(t*1000);
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 388 [5.784923]

∅:D[6.29341] → [5.790835:790975]

B:BD[5.790835] → [5.790835:790975]

             while(r.i + 1 < r.t.length && r.t[r.i + 1] < t) {
                 r.i += 1
             }
             if(r.i < r.t.length) {

[6.29341]

[5.790975]

             while(r.i < r.t.length && r.t[r.i] < t + 3600) {

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 391 [5.784923]
B:BD[5.791048] → [5.791048:791063]
B:BD[5.791063] → [6.29342:29437]
```
             }
             let t1 = t + 1800
             while(r.i + 1 < r.t.length && r.t[r.i + 1] < t1) {
```

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 392 [5.784923]

B:BD[6.29463] → [6.29463:29587]

             }
             if(r.i < r.t.length) {
                 if(!isNaN(r.y[r.i]))
                     y += r.y[r.i]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 414 [5.784923]
B:BD[5.791189] → [6.30166:30231]
```
     console.log(puissance, totalProd, totalConso, initialised);
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 449 [5.784923]
B:BD[7.355841] → [6.30962:31038]
```
     // console.log("bucket", ww, width ,s.bucket)
     // console.log(s.x)
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 451 [5.784923]
[3.2254]
[3.2254]
```
 let has_plot = false
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 454 [5.784923]
[3.2304]
[3.2304]
```
     if(event.bucket) {
         return
     }
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 462 [5.784923]
B:BD[3.2501] → [3.2501:2531]
```
         console.log(layout_)
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 464 [5.784923]
[3.2611]
[3.2611]
```
         event.bucket = soleil.bucket
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 466 [5.784923]

B:BD[3.2651] → [3.2651:2730]

         Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })

[3.2651]

[3.2730]

         if(has_plot) {
             Plotly!.update('plot', [soleil, somme], layout_)
         } else {
             Plotly!.newPlot('plot', [soleil, somme], layout_, { responsive: true })
             //@ts-ignore
             document.getElementById('plot')?.on('plotly_relayout', relayout)
             has_plot = true
         }

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 491 [5.784923]

[3.3229]

         let unite: string;
         if(soleil.bucket == 24) {
             unite = 'kWh/jour'
         } else if (soleil.bucket == 24 * 7) {
             unite = 'kWh/semaine'
         } else {
             unite = 'kWh'
         }
         layout_.yaxis.title.text = unite

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 503 [5.784923]

B:BD[3.3351] → [3.3351:3430]

         Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })

[3.3351]

[3.3430]

         if(has_plot) {
             Plotly!.update('plot', [soleil, somme], layout_)
         } else {
             Plotly!.newPlot('plot', [soleil, somme], layout_, { responsive: true })
             //@ts-ignore
             document.getElementById('plot')?.on('plotly_relayout', relayout)
             has_plot = true
         }

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 520 [5.784923]
B:BD[6.31122] → [6.31122:31164]
```
     } else if (soleil.bucket = 24 * 7) {
```
[6.31122]
[6.31164]
```
     } else if (soleil.bucket == 24 * 7) {
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 554 [5.784923]

B:BD[7.356507] → [7.356507:356583]

B:BD[7.357817] → [7.357817:357835]

B:BD[7.357835] → [3.3459:3630]

     Plotly!.react('plot', [soleil, somme], layout, { responsive: true });
     //@ts-ignore
     document.getElementById('plot')?.removeEventListener('plotly_relayout', relayout)
     document.getElementById('plot')?.addEventListener('plotly_relayout', relayout)

[7.356507]

[7.357905]

     if(has_plot) {
         Plotly!.update('plot', [soleil, somme], layout)
         //@ts-ignore
         document.getElementById('plot')?.on('plotly_relayout', relayout)
     } else {
         Plotly!.newPlot('plot', [soleil, somme], layout, { responsive: true })
         document.getElementById('plot')?.on('plotly_relayout', relayout)
         has_plot = true
     }

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 617 [5.784923]
[6.32334]
[7.359151]
```
{#if pr.length}
```

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 619 [5.784923]

[7.359173]

    <thead>
        <tr><th></th><th>Profil</th><th>Consommation annuelle</th></tr>
    </thead>
    <tbody>

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 641 [5.784923]

∅:D[7.359873] → [5.793916:793925]

B:BD[5.793916] → [5.793916:793925]

B:BD[5.793925] → [6.32761:33679]

∅:D[6.33679] → [5.794156:794166]

∅:D[7.360074] → [5.794156:794166]

B:BD[5.794156] → [5.794156:794166]

    <tr>
        <td class="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>
        </td>
        <td colspan="2"><input class="form-control" form="pdl" id="prms" name="prms" bind:value={prms}/></td>
        <td style="width:1%;white-space:nowrap;">
            <div class="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>
                {/if}
            </div>
        </td>
    </tr>

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 642 [5.784923]

[5.794357]

[7.360075]

{/if}
{#if prmsFeature}
<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}/>
    </div>
    <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>
        {/if}
    </div>
</div>
{/if}

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 660 [5.784923]

B:BD[7.360106] → [4.63:177]

    <button class="btn btn-primary" on:click={addProfil}><i class="bi bi-plus-circle"/>Ajouter un profil</button>

[7.360106]

[7.360287]

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

Remise en route des PRMs

Dependencies

In channels

Change contents

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 9 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 26 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 36 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 61 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 63 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 67 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 71 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 75 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 79 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 83 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 87 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 92 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 96 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 100 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 156 [5.784923]

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

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 307 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 309 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 314 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 316 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 319 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 324 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 330 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 334 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 342 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 348 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 377 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 381 [5.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 388 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 391 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 392 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 414 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 449 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 451 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 454 [5.784923]

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 462 [5.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 464 [5.784923]