Skip to content

Commit

Permalink
Merge pull request #16 from Daveiano/13-outsource-carbon-datatable-im…
Browse files Browse the repository at this point in the history
…plementation

13 outsource carbon datatable implementation
  • Loading branch information
Daveiano authored Jun 7, 2022
2 parents 8b43116 + f65f852 commit a61741c
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 774 deletions.
8 changes: 4 additions & 4 deletions bin/user/table_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def get_table_headers(self, obs, unit_labels, obs_labels, period):

carbon_headers.append({
"title": "Time",
"id": "timeParsed",
"id": "time",
"sortCycle": "tri-states-from-ascending",
})

Expand Down Expand Up @@ -95,13 +95,13 @@ def get_table_rows(self, obs, period, precision):
cs_time = datetime.fromtimestamp(start.raw)
# The current series item by time.
cs_item = list(filter(
lambda x: (x['timeParsed'] == cs_time.isoformat()),
lambda x: (x['time'] == cs_time.isoformat()),
carbon_values
))

if len(cs_item) == 0:
carbon_values.append({
"timeParsed": cs_time.isoformat(),
"time": cs_time.isoformat(),
observation: data.raw,
'id': start.raw
})
Expand All @@ -113,7 +113,7 @@ def get_table_rows(self, obs, period, precision):

# Sort per time
carbon_values.sort(
key=lambda item: datetime.fromisoformat(item['timeParsed'])
key=lambda item: datetime.fromisoformat(item['time'])
)

return carbon_values
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@react-hook/media-query": "^1.1.1",
"carbon-components": "10.25.0",
"carbon-components-react": "7.50.0",
"carbon-data-table-state-manager": "^1.0.2",
"carbon-icons": "7.0.7",
"d3-scale": "^4.0.2",
"moment": "^2.29.3",
Expand Down
54 changes: 0 additions & 54 deletions skins/weewx-wdc/src/js/data-table/components/pagination.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions skins/weewx-wdc/src/js/data-table/hooks/index.ts

This file was deleted.

20 changes: 0 additions & 20 deletions skins/weewx-wdc/src/js/data-table/hooks/useCollator.ts

This file was deleted.

27 changes: 0 additions & 27 deletions skins/weewx-wdc/src/js/data-table/hooks/useFilteredRows.ts

This file was deleted.

33 changes: 0 additions & 33 deletions skins/weewx-wdc/src/js/data-table/hooks/usePageInfo.ts

This file was deleted.

33 changes: 0 additions & 33 deletions skins/weewx-wdc/src/js/data-table/hooks/useRowSelection.ts

This file was deleted.

83 changes: 0 additions & 83 deletions skins/weewx-wdc/src/js/data-table/hooks/useSortInfo.ts

This file was deleted.

44 changes: 0 additions & 44 deletions skins/weewx-wdc/src/js/data-table/hooks/useSortedRows.ts

This file was deleted.

13 changes: 0 additions & 13 deletions skins/weewx-wdc/src/js/data-table/hooks/useUniqueId.ts

This file was deleted.

16 changes: 0 additions & 16 deletions skins/weewx-wdc/src/js/data-table/misc/doesRowMatchSearchString.ts

This file was deleted.

Loading

0 comments on commit a61741c

Please sign in to comment.