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.

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

Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
bad8910
added files for admin unit page
Feb 23, 2022
dfdd1fe
Merge branch 'OpenEnergyDashboard:resourceGeneralization' into resour…
andrew-cline Feb 23, 2022
b573378
added front-end starter code for admin units page
Feb 25, 2022
ef1263a
added necessary files for displaying units
Mar 2, 2022
4bd9970
finished unit display page, added page and form for adding units
Mar 4, 2022
3df5e1b
Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…
Mar 7, 2022
21147ad
added ES and FR translation messages for unit page
JustLe56 Mar 9, 2022
301addc
edited UnitsDetailContainer
Mar 9, 2022
d0a0561
edited UnitsDetailContainer
Mar 9, 2022
069df2f
edited units details component, container, etc
sagarprasad63574 Mar 9, 2022
87c0ee0
Merge pull request #1 from andrew-cline/sagar
sagarprasad63574 Mar 9, 2022
0c9eb3b
added header and footer to UnitDetailComponent
JustLe56 Mar 11, 2022
40b5e2b
Merge pull request #2 from andrew-cline/resourceGenJustin
andrew-cline Mar 11, 2022
7221074
testing
sagarprasad63574 Mar 11, 2022
b8d2697
Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…
sagarprasad63574 Mar 11, 2022
3a9d972
IDK
sagarprasad63574 Mar 11, 2022
0a8641e
Merge pull request #3 from andrew-cline/sagar
sagarprasad63574 Mar 11, 2022
65fcb98
Added the button to identifier. Need to fix the logic
sagarprasad63574 Mar 13, 2022
16f292f
added SecInRate update; updates in client but does not save to databa…
JustLe56 Mar 13, 2022
78679a9
added button to unitRepresent column in UnitViewComponent
Mar 14, 2022
2ee835e
Merge pull request #4 from andrew-cline/sagar
andrew-cline Mar 14, 2022
c21e557
Merge branch 'resourceGeneralization' into resourceGenJustin
andrew-cline Mar 14, 2022
977af8d
Merge pull request #5 from andrew-cline/resourceGenJustin
andrew-cline Mar 14, 2022
e786a35
Revert "Add SecInRate edit button"
andrew-cline Mar 14, 2022
6d97d4a
Merge pull request #6 from andrew-cline/revert-5-resourceGenJustin
andrew-cline Mar 14, 2022
e56336b
Revert "Added the button to identifier. Need to fix the logic"
andrew-cline Mar 14, 2022
81f5c11
Merge pull request #7 from andrew-cline/revert-4-sagar
andrew-cline Mar 14, 2022
197499a
Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…
Mar 14, 2022
280bfc2
added a button to the notes column in units page
Hardik-Kharpude Mar 14, 2022
099f3db
Merge pull request #8 from andrew-cline/Andrew
andrew-cline Mar 15, 2022
47d155b
merged resourceGenJustin with Andrew
Mar 15, 2022
9a1f10a
Merge pull request #9 from andrew-cline/Andrew
andrew-cline Mar 15, 2022
4970461
added UnitRepresent button
Mar 15, 2022
bf3acb0
Merge pull request #10 from andrew-cline/Andrew
andrew-cline Mar 15, 2022
cd7a601
Made changes to the backend
sagarprasad63574 Mar 16, 2022
75dc855
Edited the backend and updated the code to work with unit represent a…
sagarprasad63574 Mar 17, 2022
6e24243
Merge branch 'resourceGeneralization' into HardikNoteButton
andrew-cline Mar 18, 2022
e160f91
Merge pull request #12 from andrew-cline/HardikNoteButton
andrew-cline Mar 18, 2022
caae710
fixed somethings leftover from merge
Mar 18, 2022
bc63c9b
edited routes to include check for admin privledge
Mar 18, 2022
4a4f6d1
Merge pull request #13 from andrew-cline/Andrew
andrew-cline Mar 18, 2022
510518d
added validation for secInRate
Mar 18, 2022
b6bda0b
Merge pull request #14 from andrew-cline/Andrew
andrew-cline Mar 18, 2022
d1205d1
fixed status message displaying on all columns
JustLe56 Mar 19, 2022
1746c64
fixed checkbox; add submitNewUnit; changed unit id and identifer defi…
JustLe56 Mar 19, 2022
2bb7525
fixed bug in unit create form
Mar 19, 2022
52b2084
fixed spelling in translation file
Mar 19, 2022
a8e3d92
misc text fixes
JustLe56 Mar 20, 2022
46ab235
added eng message for create unit container
JustLe56 Mar 23, 2022
fedd827
fixes default selected dropdowns not triggering onchange
JustLe56 Mar 23, 2022
d542993
Merge branch 'OpenEnergyDashboard:resourceGeneralization' into resour…
andrew-cline Mar 23, 2022
6b721bf
Merge branch 'resourceGeneralization' into sagar
andrew-cline Mar 23, 2022
1b1b34f
Merge pull request #11 from andrew-cline/sagar
andrew-cline Mar 23, 2022
0c0bbfc
Merge branch 'justin_add_units' of https://github.com/andrew-cline/OE…
Mar 23, 2022
01edb7a
Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…
Mar 23, 2022
d016dce
added formatted messages to createUnitComponent
Mar 23, 2022
1568bab
fixed preferredDisplay in UnitViewComponent
Mar 23, 2022
0e2a55b
Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…
Apr 6, 2022
776fe49
removed duplicate unit files
Apr 6, 2022
0feaf05
updated app.js to use units.js
Apr 6, 2022
9595b06
added jsonSchema import to units.js
Apr 6, 2022
d6830c5
changed add unit link to a modal display; need to add form content
JustLe56 Apr 8, 2022
ce211da
adds modal create unit form; currently not working needs container
JustLe56 Apr 8, 2022
8661b3d
fixed imports
JustLe56 Apr 11, 2022
eb202a3
modal variation using hooks, does not actually modify database yet
JustLe56 Apr 13, 2022
74e971c
create unit modal successfully submits to database; updated create un…
JustLe56 Apr 13, 2022
62cab69
UnitModelEdit
sagarprasad63574 Apr 15, 2022
d0d9790
polished code formatting and added some comments
JustLe56 Apr 15, 2022
ea7807a
fixed unit state issue
JustLe56 Apr 15, 2022
8fd0b51
fixed unit state issue
Apr 15, 2022
e996187
Merge branch 'justin_createUnitModal' of https://github.com/andrew-cl…
JustLe56 Apr 15, 2022
01cfb9b
Merge branch 'Unit_Dropdown' of https://github.com/andrew-cline/OED i…
JustLe56 Apr 15, 2022
9fbce24
Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…
sagarprasad63574 Apr 16, 2022
74e9f54
added group dropdown logic and unit to group state
Apr 18, 2022
4560037
edited submitNewUnit and addUnit route
Apr 19, 2022
17ed18e
Working with unit model on the unit page and unit edit. Some problems…
sagarprasad63574 Apr 22, 2022
913c1b1
lint changes
JustLe56 Apr 22, 2022
f138926
more linter changes
JustLe56 Apr 22, 2022
5919a2f
Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…
JustLe56 Apr 22, 2022
c262a45
included edit note in render
JustLe56 Apr 22, 2022
5bd790f
added comments and lint changes
JustLe56 Apr 22, 2022
6381926
added group dropdown
Hardik-Kharpude Apr 25, 2022
be05be6
cleaned up group dropdown code
Apr 25, 2022
8498ab4
Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…
Apr 25, 2022
7723f42
removed extra lines in one function
Apr 25, 2022
c276630
Bug Fixes and Editing the modal for the units page and edit unit
sagarprasad63574 Apr 26, 2022
af3c126
Bug Fixes
sagarprasad63574 Apr 26, 2022
0cae666
Merge branch 'UnitModelEdit' of https://github.com/andrew-cline/OED i…
JustLe56 Apr 26, 2022
a5bc704
Merge branch 'UnitModelEdit' of https://github.com/andrew-cline/OED i…
JustLe56 Apr 26, 2022
6ffc545
Get groups mostly working with units
huss Apr 27, 2022
0354810
added linter fixes
JustLe56 Apr 27, 2022
a47862c
added documentation and cleaned up comments
JustLe56 Apr 27, 2022
3cbf089
Bug fixes
sagarprasad63574 Apr 27, 2022
4d2d9d6
Merge branch 'modalEdit_modalCreate' of https://github.com/andrew-cli…
sagarprasad63574 Apr 27, 2022
d9816ad
fix check issue
huss Apr 27, 2022
46a6721
linter fixes
JustLe56 Apr 27, 2022
10af912
added suggested changes
Apr 27, 2022
ebadd65
Merge branch 'group_dropdown' of https://github.com/andrew-cline/OED …
Apr 27, 2022
0ffcd8e
See PR for what was done
huss Apr 28, 2022
2b2a211
remove unique constaint
huss Apr 29, 2022
fc31044
remove left over trailing comma
huss Apr 29, 2022
9d59efc
updated translations
JustLe56 Apr 29, 2022
8b4b241
removed unit.create.new.unit
JustLe56 Apr 29, 2022
fd3bc36
updated create and edit unit forms to use enums
May 2, 2022
0e833d5
removed unused import
May 2, 2022
b3fe74e
made changes based on comments on pull request
May 4, 2022
056b8e7
changed createUnitModalComponent form
JustLe56 May 4, 2022
35def3f
Merge branch 'modalEdit_modalCreate' of https://github.com/andrew-cli…
JustLe56 May 4, 2022
06704ac
updates (see details below)
huss May 7, 2022
eaba006
Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…
huss Jul 4, 2022
a2aa8ba
commit with updated changes from pr#766 and re implimented changes
wootent Jul 6, 2022
8a26647
updated createUnitModal
wootent Jul 7, 2022
3401d98
fixed SQL to update/edit units - name of unit was not able to change,…
wootent Jul 7, 2022
5192597
cleaned up create unit modal container & componet
wootent Jul 8, 2022
7a85812
added function to refresh page after unit is created
wootent Jul 8, 2022
b6a7de8
ProtoTyped color code display on Unit cards
wootent Jul 8, 2022
7b42471
small change to last edit
wootent Jul 8, 2022
4e85b9f
Pre-commit commit. Made updates to the unit page: Removed the need fo…
Deelane Jul 9, 2022
bd1e376
Fixed EditUnitModalComponentProps misnamed in file
Deelane Jul 9, 2022
a98760a
Added notifications for success and failure of adding/editing units
Deelane Jul 9, 2022
8e27a91
Updated initial units fetch, added new action
Deelane Jul 10, 2022
cf22cfa
changed close button to dicard changes and CSS update
wootent Jul 12, 2022
84560e0
update edit unit modal - save all btn disabled when no values for nam…
wootent Jul 12, 2022
10ee02f
update to edit modal
wootent Jul 12, 2022
33460f9
Fixed bugs causing store not to properly update, fixed units page not…
Deelane Jul 13, 2022
f794656
removed old comment
Deelane Jul 13, 2022
7b6c113
Merge branch 'twoot_766_fork' into pr-766-test-changes
Deelane Jul 14, 2022
42648ab
Merge pull request #5 from Deelane/pr-766-test-changes
Deelane Jul 14, 2022
407d496
Merged wootent and deelane pr766 changes
Deelane Jul 14, 2022
d68082c
fixed sorting to account for lowercase
Deelane Jul 15, 2022
19c83d9
fix perferred display
wootent Jul 15, 2022
f266646
Merge branch 'pr-766-wootent-deelane-merge' of https://github.com/Dee…
wootent Jul 15, 2022
326bd93
added english mappings for success/failure to edit and create units
Deelane Jul 15, 2022
deba09d
Removed unnecessary state variable edited units and associated action…
Deelane Jul 15, 2022
63770c0
Merge branch 'pr/andrew-cline/765' into units-page-group-dropdown-merge
Deelane Jul 15, 2022
08cea67
get unit translation into all languages
huss Jul 16, 2022
35a4e38
help link fixed for units
huss Jul 16, 2022
a87edd6
add units to test data
huss Jul 16, 2022
5c2c9b4
Merge branch 'pr-766-wootent-deelane-merge' into units-page-group-dro…
Deelane Jul 17, 2022
b80551a
unit identifier now defaults to unit name if left blank when creating…
Deelane Jul 17, 2022
2b3be76
made html component fields per line, removed unused code
Deelane Jul 17, 2022
ecae946
update units+
huss Jul 18, 2022
cc39d7f
merge upstream
huss Jul 18, 2022
d39c914
reverse the order on the edit and create modal popups so the identifi…
wootent Jul 18, 2022
1a8eb61
HTML format changes so edit & create modal appears as close as possia…
wootent Jul 18, 2022
d0da163
put the identifier in the blue title of each card on view page and pu…
wootent Jul 18, 2022
88f5798
preferred display on two lines if false corrected
wootent Jul 18, 2022
fa53805
revert so sort units by identifier again
huss Jul 18, 2022
262837d
Added help icon to Edit unit modal.
AustinStewart95 Jul 18, 2022
3cb7877
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
AustinStewart95 Jul 18, 2022
2877e20
Added background color to displayable in unit card
jbonbright Jul 18, 2022
ff58f28
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
jbonbright Jul 19, 2022
b9f8649
Reduce CreateUnit handlers to update many inputs
Jul 20, 2022
81fae2d
Updated edit unit rate value to stop scroll or down arrow ability, ca…
nanoarzqta Jul 20, 2022
bba7f51
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
jebonbright5 Jul 20, 2022
6c481c7
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
nanoarzqta Jul 20, 2022
41b13b4
Reduce EditUnit handlers to update many inputs
Jul 20, 2022
fa9e192
Reduce EditUnit handlers to update many inputs
Jul 20, 2022
1ea1b1b
sec in rate > 0
huss Jul 20, 2022
b3d8f42
Added help text icon to create unit modal.
AustinStewart95 Jul 20, 2022
d9c77ee
Meter Modal devlopment
wootent Jul 21, 2022
6337a61
fixed meterview - added translate
wootent Jul 21, 2022
626efcb
fixed css for meterview - added class for card-container
wootent Jul 21, 2022
e3e519b
fixed formmated messages
wootent Jul 21, 2022
6d20d44
UI updates
wootent Jul 21, 2022
7fd2f26
Changes to ChartDataSelectComponent: units/meters/groups selects now …
Deelane Jul 22, 2022
9b34341
add test groups
huss Jul 23, 2022
4c46f74
updates
wootent Jul 23, 2022
983fa46
update unit testData
huss Jul 23, 2022
407dc68
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
wootent Jul 23, 2022
8e901c5
Removed buttons, extraneous code and comments
Deelane Jul 23, 2022
f09d0bf
fix missing units on meter in testData
huss Jul 23, 2022
dc6453d
Merge branch 'units-page-group-dropdown-merge' of https://github.com/…
huss Jul 23, 2022
359db6c
Added first version of new rate menu allowing for the selection of di…
Deelane Jul 25, 2022
c008d4c
update rate menu code
huss Jul 25, 2022
71e654a
Delete settings.json
huss Jul 25, 2022
d961b04
update testing & more
huss Jul 26, 2022
52114d6
Removed unused code, addressed comments
Deelane Jul 26, 2022
7ac4bd9
Removed more unused code, addressed comments
Deelane Jul 26, 2022
94c8080
update test data & more
huss Jul 28, 2022
8e090a0
minor update to ensure submitting array is overwritten properly
Deelane Jul 28, 2022
ee558c7
small function call optimization
Deelane Jul 30, 2022
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
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ services:
- POSTGRES_PASSWORD=pleaseChange # default postgres password that should be changed for security.
volumes:
- ./postgres-data:/var/lib/postgresql/data/pgdata
#ports:
# - "5432:5432"
# ports:
# - "5432:5432"
# Uncomment the above lines to enable access to the PostgreSQL server
# from the host machine.
# Web service runs Node
Expand Down
Loading