sbrl-github/Air-Quality-Web
1
0
Fork 0
mirror of https://github.com/ConnectedHumber/Air-Quality-Web synced 2024-11-25 06:53:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:ConnectedHumber/Air-Quality-Web

Browse source
This commit is contained in:
Starbeamrainbowlabs 2019-03-17 13:29:58 +00:00
commit 9ba4b90c18
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -1,5 +1,9 @@
# Changelog # Changelog
## v0.5.4 - 14th March 2019
- [API] Added device altitude information to `list-devices` and `device-info` actions
- [API] Added device type id property to `list-devices` action
## v0.5.3 - 7th March 2019 ## v0.5.3 - 7th March 2019
- Tweak x axis labels - Tweak x axis labels
- Build script: Improve first-time setup experience - Build script: Improve first-time setup experience

6
logic/Repositories/MariaDBDeviceRepository.php
View file

@ -13,6 +13,7 @@ class MariaDBDeviceRepository implements IDeviceRepository {
public static $column_owner_id = "owner_id"; public static $column_owner_id = "owner_id";
public static $column_lat = "device_latitude"; public static $column_lat = "device_latitude";
public static $column_long = "device_longitude"; public static $column_long = "device_longitude";
public static $column_altitude = "device_altitude";
public static $table_name_type = "device_types"; public static $table_name_type = "device_types";
public static $column_type_id = "device_type"; public static $column_type_id = "device_type";
@ -51,7 +52,9 @@ class MariaDBDeviceRepository implements IDeviceRepository {
{$s("column_device_id")} AS id, {$s("column_device_id")} AS id,
{$s("column_device_name")} AS name, {$s("column_device_name")} AS name,
{$s("column_lat")} AS latitude, {$s("column_lat")} AS latitude,
{$s("column_long")} AS longitude {$s("column_long")} AS longitude,
{$s("column_altitude")} AS altitude,
{$s("column_device_type")} AS type_id
FROM {$s("table_name")}"; FROM {$s("table_name")}";
if($only_with_location) if($only_with_location)
@ -73,6 +76,7 @@ class MariaDBDeviceRepository implements IDeviceRepository {
{$s("table_name")}.{$s("column_device_name")} AS name, {$s("table_name")}.{$s("column_device_name")} AS name,
{$s("table_name")}.{$s("column_lat")} AS latitude, {$s("table_name")}.{$s("column_lat")} AS latitude,
{$s("table_name")}.{$s("column_long")} AS longitude, {$s("table_name")}.{$s("column_long")} AS longitude,
{$s("table_name")}.{$s("column_altitude")} AS altitude,
{$s("table_name_type")}.* {$s("table_name_type")}.*
FROM {$s("table_name")} FROM {$s("table_name")}
JOIN {$s("table_name_type")} ON JOIN {$s("table_name_type")} ON

2
version
View file

@ -1 +1 @@
v0.5.3 v0.5.4.1