Create generate Rrule Function by davanmur · Pull Request #1565 · OpenEnergyDashboard/OED

davanmur · 2026-01-06T23:58:18Z

Description

Created a backend function that could take in information from the weekly and daily conversion patterns, and created an rrule (recurrence rule) so that conversions patterns could easily and efficiently be applied over a length of time. Integrated that function in timeVaryingPathConversion.js.

Partly Addresses #896

Type of change

Note merging this changes the database configuration.
This change requires a documentation update

Checklist

I have followed the OED pull request ideas
I have removed text in ( ) from the issue request
You acknowledge that every person contributing to this work has signed the OED Contributing License Agreement and each author is listed in the Description section.

Limitations

Based on my manual testing generateRrule.js works and segments are correctly added to edgeSegments timeVaryingPathConversion.js
The is an issue with memory that seems to be related to a potentially infinite while in timeVaryingPathConversion.js

…LF to LF

…dates

Currently read-only. Uses fake data, as the Weeks API is not yet implemented.

… in navbar to "Patterns - Weekly"

…y/weeks-api

…rontend into edit-conversions

Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

…wPage merge backend

* CRUD operations working with back-end * client-side validation * delete confirmation * Spanish and French translations

…y/weeks-api

Omit `id` from the default week values model

docker-compose should not be ignored and should not have to be altered for our time-varying conversion work

… table

…wPage

…/hook_conversion_to_backend

…on conflict Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

…icts

Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

…dd them to edgeSegments

…enerateRrule.ts

This appears to be a basic working version for both slope/intercept and patterns. I wanted to save the work to be safe. Here is what was done: - Fixed addition of segments to match pre-pattern method and get code to work properly. - Changed how -infinity & infinity are dealt with. They are converted to fixed dates so the code works. This isn't the ideal/final solution but works for now. - Fixed the exact dates included in a pattern. - Move conn to last argument since most functions do that. - Clarified some commenting. - Minor formatting. - There are a lot of debug console statements due to the need to test more. They will be removed.

Mostly to protect against a mistake.

This version is not yet working in all cases but committing at this point. - The earlier fix to shift by 1 day caused it to make mistake. This changes it to shift by 1 minute that seems to work. - Unwinding the RRule set the end time with the duration rather than adding the duration to the start time. - Misc. commenting & debug console (to be removed)

- The edgeSegments were not yet sorted per a comment so that was added. - Added comments to timeVaryingPathConversion.

This version was moderately tested and seem to work reasonably. The debug statements are removed along with old code that had issues. There are still some items to do including getting cik done with cik_vary and testing/working on suffix units.

- The new code treated the result of invertConversion as an object but it was an array. Decided to convert to object and fix other call to work. - Fix invertConversion so works if slope or conversion are zero. - Misc minor fixes. - Suffix units do not work yet and have NaN for slope/intercept.

This is a version that has been moderately tested. For the first time the test data for developers now works. It has some TODO item including that it cannot deal with time-varying conversions with suffix units and not updating if suffix conversion changes. - Updated how path was updated to deal with time varying conversions. - Changed so cik updated based on cik_vary. This fixed issues with the old version that had issues and makes sure they are consistent.

- Remove createCikArray since no longer done. - Minor comment.

huss · 2026-07-10T13:12:08Z

I have made a sequence of commits lately. At this point the status is:

The code works to generate the rule, apply to conversions & put into the DB (cik, cik_vary). This includes general patterns, suffix units, etc.
The code passes all tests.
The code works for the standard developer test data (not really time-varying).
I have read the code carefully to make changes but need to do a final pass that it is ok.
More test cases are needed but it does seem to run fine.
There are a few open TODO items that can be addressed either before or after this is merged.
An open question is when this will merge. There is ongoing work on adding holidays and getting close to a final DB implementation for time-varying. This work includes the unmerged time-varying front-end (still has issues) so that really should be merged first. The other work on DB may get merged first and become the point for moving forward so this would merge on top of that too. It is a version that allows for graphing of data so certain manual tests are much easier. The bottom line is I am okay with it merging when the time is right (after resolving merge conflicts and retesting) as long as it will undergo more testing in the future as will have to be done with the entire time-vary system.

Thanks to @davanmur for this contribution. I look forward to its formal inclusion in OED.

minhtriet359 and others added 30 commits June 29, 2025 18:28

updated layout for create a conversion modal, changed scripts from CR…

70c4e39

…LF to LF

changed state in create conversion modal to be compitable with new up…

de6ee87

…dates

created an overview page for daily patterns

ffaf4a9

changed component folder name from days to daily-pattern

e72bbd7

Initial UI for the weekly conversion patterns feature

e437035

Currently read-only. Uses fake data, as the Weeks API is not yet implemented.

added UI for for daily pattern overview page and create modal

9d2d38a

Merge branch 'oed-csumb-su25:development' into evan-carey/weekly-pattern

69e9433

feat(weeks): add help tooltips to week views; change /weeks page link…

9f65376

… in navbar to "Patterns - Weekly"

Merge remote-tracking branch 'oed-backend/taliaBranch' into evan-care…

f4a0cc5

…y/weeks-api

Merge branch 'development' of https://github.com/oed-csumb-su25/OED-f…

3cae2f2

…rontend into edit-conversions

Add fr/es translations for Edit Conversion UI

5691a31

Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

Merge remote-tracking branch 'backend/taliaBranch' into triet_overvie…

77d031c

…wPage merge backend

feat(weeks): complete weekly conversion patterns feature

47b3130

* CRUD operations working with back-end * client-side validation * delete confirmation * Spanish and French translations

Merge remote-tracking branch 'oed-backend/taliaBranch' into evan-care…

6af16b5

…y/weeks-api

fix(weeks): create week API request fails because id is included

8835272

Omit `id` from the default week values model

revert changes to gitignore and docker-compose

dbfd046

docker-compose should not be ignored and should not have to be altered for our time-varying conversion work

fix(database): weeks table must be created before conversion_segments…

63deb77

… table

Merge remote-tracking branch 'talia/taliaBranch' into edit-conversions

7a6e8ed

created UI for day overview page and create day modal

6eccbe3

Merge remote-tracking branch 'backend/taliaBranch' into triet_overvie…

f13fa05

…wPage

hooked up day to backend

70f0da5

added check to make sure days cannot have the same name

24abf08

hooked conversion create modal - need to connect pattern

da3e438

Merge remote-tracking branch 'origin/evan-carey/weeks-api' into Triet…

7fba152

…/hook_conversion_to_backend

fix merge errors

69c2ebb

hooked up create conversion to backend

7bb4599

revert changes to git.ignore and docker-compose.yml

e9bdc07

Merge timeVaryingConversion into edit-conversions: resolved translati…

91d3d23

…on conflict Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

Merge Talia’s taliaBranch into edit-conversions after resolving confl…

cdec8e0

…icts

undo formatting changes to docker-compose

92bd352

PRINCESANCHEZ and others added 29 commits September 12, 2025 12:55

Update split time placeholder to use complete and move to translations

c61046b

Signed-off-by: PRINCESANCHEZ <princesanchez72@gmail.com>

redo changes I accidentally undid

46df415

install rrule

c172ef5

getting data from createWeekModalComponent to generateRrule

27e7ca6

generate an rrule from data

8548f28

move generateRule to server

07ed783

timeVaryingPathConversion script

30a2b3b

update redoCik and add updateCikVaryAndViews script to package.json

821ad97

update createConversionArrays.js (for redoCik)

36b441d

remove frontend testing, add CikVary model, and fix script

bba473f

fixes to timeVaryPathConversion

9eb2f66

add sql/cik_vary sql files

286f8ed

update timeVaryingPathConversion

c3d6ca1

update generateRrule to fetch week and unique daySegments

b6b48ae

call generateRule in timeVaryingPathConversions and generate occurences

521c5be

fix generateRrule

61d84c7

add code to create new ConversionSegments from rrule occurences and a…

665a4df

…dd them to edgeSegments

clean up comments

3c871d4

remove used variables from CreateWeekModalComponent

402c32a

delete unused import from CreateWeekModalComponent

8da7990

fix up generateRrule.js and timeVaryingPathConversion.js and delete g…

f496eda

…enerateRrule.ts

Add limit on num cik_vary

e55d265

Mostly to protect against a mistake.

fix sort issue & comments

87b7f39

- The edgeSegments were not yet sorted per a comment so that was added. - Added comments to timeVaryingPathConversion.

Cleanup

dce22e0

This version was moderately tested and seem to work reasonably. The debug statements are removed along with old code that had issues. There are still some items to do including getting cik done with cik_vary and testing/working on suffix units.

cleanup

7bbe86e

- Remove createCikArray since no longer done. - Minor comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Create generate Rrule Function#1565

Create generate Rrule Function#1565
davanmur wants to merge 199 commits into
OpenEnergyDashboard:timeVaryfrom
davanmur:generateRrule_from1516

davanmur commented Jan 6, 2026 •

edited

Loading

Uh oh!

huss commented Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

davanmur commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

Checklist

Limitations

Uh oh!

huss commented Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

davanmur commented Jan 6, 2026 •

edited

Loading