Skip to content

Commit

Permalink
Merge pull request #252 from membermatters/dev
Browse files Browse the repository at this point in the history
v3.6.3
  • Loading branch information
jabelone authored Apr 8, 2024
2 parents af25d68 + 49befa2 commit 97f0039
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v3.6.3] - 2024-04-08

### Fixed

- SpaceAPI return type for sensor values fixed (thanks @rechner)

## [v3.6.2] - 2024-02-02

### Fixed
Expand Down
10 changes: 5 additions & 5 deletions memberportal/api_spacedirectory/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def get(self, request):
## Setup the basic details
sensor_details = {
"name": sensor.name,
"description": sensor.description,
"description": sensor.description or "",
"location": sensor.location,
}

Expand All @@ -83,11 +83,11 @@ def get(self, request):
signout_date=None
).order_by("-signin_date")

sensor_data["total_member_count"] = {"value": spaceapi_user_count}
sensor_data["total_member_count"] = [{"value": spaceapi_user_count}]

sensor_data["people_now_present"] = {
"value": spaceapi_members_on_site.count()
}
sensor_data["people_now_present"] = [
{"value": spaceapi_members_on_site.count()}
]

# Is the camera array empty? If not, add them
if not config.SPACE_DIRECTORY_CAMS:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "membermatters",
"version": "3.6.2",
"version": "3.6.3",
"devDependencies": {
"eslint-webpack-plugin": "^3.1.1",
"husky": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.6.2",
"version": "3.6.3",
"description": "The MemberMatters frontend",
"productName": "MemberMatters",
"author": "Jaimyn Mayer <[email protected]>",
Expand Down

0 comments on commit 97f0039

Please sign in to comment.