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

Inventory groups frontend edits #4820

Merged
merged 49 commits into from
Oct 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f444f80
Added inventory groups
ebeers-png Jul 26, 2024
e832ecb
fixed formatting
ebeers-png Jul 26, 2024
ab33a44
Add in AH
haneslinger Aug 12, 2024
9e1ee89
Groups Details page
haneslinger Aug 15, 2024
0ec3610
Lint
haneslinger Aug 16, 2024
12205ce
Merge branch 'inventory_groups' of https://github.com/SEED-platform/s…
Aug 27, 2024
9fbfc21
rp edits
Aug 27, 2024
b9bcec7
fix migrations
Sep 11, 2024
4c93a40
add group buttons to inv detail
Sep 13, 2024
6568543
groups to look like labels/dcs
Sep 13, 2024
37a2197
least common ancestor
Sep 23, 2024
675073f
add all alis to group modal
Sep 23, 2024
654d96d
merge develop
Sep 23, 2024
814e9f9
move lowest common to org view
Sep 23, 2024
4163a47
development
Sep 23, 2024
7bc4a0c
migration
Sep 23, 2024
0a6bf5b
member list default
Sep 24, 2024
d8b31f2
optimize lowest_common
Sep 24, 2024
e46b0ce
functional pre same node constraint
Sep 25, 2024
9212e85
validate inventorygroup for name and org
Sep 25, 2024
1d3b167
fe error handling on group create
Sep 25, 2024
dd6a0eb
mapping constraint, inventory and group must share ali
Sep 26, 2024
c9868da
precommit
Sep 26, 2024
444f3ed
overhaul of the serializer and member list
Sep 27, 2024
b743b3e
add and remove button bugs
Sep 27, 2024
985e844
precommit
Sep 27, 2024
7a53796
merge develop
Sep 27, 2024
d84e41d
Merge branch 'develop' into inventory_groups-frontend-edits
Sep 27, 2024
4ccdf8f
merge conflicts
Sep 27, 2024
a482d98
merge conflicts
Sep 27, 2024
79e276c
Fix `hiredis` not found error (#4821)
axelstudios Sep 27, 2024
514cf58
navigation bugs
Sep 30, 2024
5135266
navigation bugs
Sep 30, 2024
55da4ae
Merge branch 'develop' into inventory_groups-frontend-edits
perryr16 Sep 30, 2024
951cd30
merge conflicts
Sep 30, 2024
5ccc864
merge conflicts
Sep 30, 2024
b15da82
troubleshooting
Sep 30, 2024
1f0137f
id bug
Sep 30, 2024
7c6c7fe
migration order
Sep 30, 2024
6ac6787
lint
Sep 30, 2024
5093536
fix tests
Sep 30, 2024
a42f6c3
merge
Sep 30, 2024
8573e8a
integrate with develop
Sep 30, 2024
ed714f3
fix tests, simplify migration, formatting
Oct 1, 2024
e1b697a
lint
Oct 1, 2024
3eda92e
dry mapping presave
Oct 1, 2024
505544e
group meters page
Oct 2, 2024
30cf07c
Merge branch 'inventory-groups-develop' into inventory_groups-fronten…
Oct 4, 2024
44a02a4
fix test
Oct 4, 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
Prev Previous commit
Next Next commit
id bug
Ross Perry authored and Ross Perry committed Sep 30, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 1f0137f24373e5a56211632f3d289d7aaf7c4ca7
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@ <h1>{$:: 'Group Detail' | translate $}</h1>
<div class="in-development">
DASHBOARD IN DEVELOPMENT...
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -21,4 +21,4 @@ <h1>{$:: 'Group Detail' | translate $}</h1>
METERS IN DEVELOPMENT...
<!-- Should reuse inv detail meter html -->
</div>
</div>
</div>
10 changes: 5 additions & 5 deletions seed/static/seed/partials/inventory_group_detail_nav.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a id="dashboard" ui-sref="inventory_group_detail_dashboard(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" ng-if="inventory_type === 'properties'" translate>Dashboard</a>
<a id="inventory_list" ui-sref="inventory_groups_inventory_list(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Properties</a>
<a id="systems" ui-sref="inventory_group_detail_systems(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Systems & Services</a>
<a id="meters" ui-sref="inventory_group_detail_meters(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Meters</a>
<a id="map" ui-sref="inventory_group_map(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Map</a>
<a id="group-dashboard" ui-sref="inventory_group_detail_dashboard(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" ng-if="inventory_type === 'properties'" translate>Dashboard</a>
<a id="group-inventory_list" ui-sref="inventory_groups_inventory_list(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Properties</a>
<a id="group-systems" ui-sref="inventory_group_detail_systems(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Systems & Services</a>
<a id="group-meters" ui-sref="inventory_group_detail_meters(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Meters</a>
<a id="group-map" ui-sref="inventory_group_map(::{inventory_type: inventory_type, group_id: group_id})" ui-sref-active="active" translate>Map</a>
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@ <h1>{$:: 'Group Detail' | translate $}</h1>
<div class="in-development">
SYSTEMS & SERVICES IN DEVELOPMENT...
</div>
</div>
</div>