Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom rate and named standard rate for units (Issue #1216) #1388

Merged
merged 42 commits into from
Jan 8, 2025
Merged

Custom rate and named standard rate for units (Issue #1216) #1388

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
beb6a0c
for review
gyordong Jul 11, 2024
43c1523
Merge remote-tracking branch 'refs/remotes/origin/development' into d…
gyordong Jul 11, 2024
4febda4
Merge branch 'OpenEnergyDashboard:development' into development
gyordong Jul 14, 2024
b261838
added normal unit interval functionality
gyordong Jul 14, 2024
4281f58
finishing remote merge
gyordong Jul 15, 2024
019712e
updated
gyordong Jul 16, 2024
7fb7a79
added a label to custom input and made it save the last value input
gyordong Jul 27, 2024
5154df6
idk
gyordong Jul 27, 2024
26502af
Merge branch 'OpenEnergyDashboard:development' into development
gyordong Jul 27, 2024
f845f59
updated default rate
gyordong Jul 30, 2024
5446e61
update
gyordong Jul 30, 2024
926e412
updated save state for custom rate to not require enter and added val…
gyordong Aug 2, 2024
d6b019a
fixed integer validation along with some labels and set default value…
gyordong Aug 6, 2024
91a1f03
made custom rate update to the last selected standard value, added tr…
gyordong Aug 7, 2024
a954d44
all functionality except a new error for non integer input and defaul…
gyordong Aug 15, 2024
0e90875
Merge remote-tracking branch 'upstream/development' into development
huss Aug 16, 2024
935d1ca
update unit modals
huss Aug 20, 2024
0f8191e
partial update to modify
huss Oct 4, 2024
0c564f5
added handleenter() so function relies on enter to save, added commen…
gyordong Nov 15, 2024
426c593
rearranged the handleShow() and handleClose() to be in the end state
aduques Nov 15, 2024
63e91ed
Merge branch 'development' of https://github.com/gyordong/OEDdev into…
aduques Nov 15, 2024
b2390b8
removed comments as requested by maintainer for PR
gyordong Nov 15, 2024
47dfa72
formatting, comment clean-up and added a mozilla header
gyordong Nov 17, 2024
acd73c5
Revert "Merge remote-tracking branch 'origin/1188sort' into 1216issue"
gyordong Nov 17, 2024
499529c
Update data.ts
gyordong Nov 17, 2024
071eabe
typo
gyordong Nov 17, 2024
fd41ad2
Merge branch 'OpenEnergyDashboard:development' into 1188sort
gyordong Nov 20, 2024
c30134d
syntax changes and clean up
gyordong Nov 22, 2024
8020cd6
more syntax changes
gyordong Nov 22, 2024
5359c6e
refactored handlesave
gyordong Nov 22, 2024
8f223a1
made function specific to secinrate and updated customrate value
gyordong Nov 22, 2024
1cba62a
@emilysarne implemented isCustomRate() in editunitmodalcomponent.tsx,…
gyordong Nov 24, 2024
fd6f6a4
Update EditUnitModalComponent.tsx
aduques Nov 25, 2024
82859f8
fixed syntax
aduques Nov 25, 2024
0750920
Merge branch '1188sort' of https://github.com/gyordong/OEDdev into 11…
aduques Nov 25, 2024
c2cdc43
removed line that was added from earlier merge
aduques Nov 25, 2024
50ab201
added check for enter on createunitmodalcomponent.tsx
gyordong Nov 25, 2024
b9599f5
added enter on createunit pt2
gyordong Nov 25, 2024
06cd31f
create checks for nonstandard rate
gyordong Dec 26, 2024
f2cd903
Merge branch 'OpenEnergyDashboard:development' into 1188sort
aduques Dec 29, 2024
0d50224
align edit/create unit + other
huss Dec 30, 2024
345131f
Merge remote-tracking branch 'gyordong/1188sort' into pr/gyordong/1388
huss Dec 30, 2024
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
Loading
Loading