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

pull/26/head
Starbeamrainbowlabs 4 years ago
commit 9ba4b90c18
Signed by: sbrl
GPG Key ID: 1BE5172E637709C2
  1. 4
      Changelog.md
  2. 6
      logic/Repositories/MariaDBDeviceRepository.php
  3. 2
      version

@ -1,5 +1,9 @@
# 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
- Tweak x axis labels
- Build script: Improve first-time setup experience

@ -13,6 +13,7 @@ class MariaDBDeviceRepository implements IDeviceRepository {
public static $column_owner_id = "owner_id";
public static $column_lat = "device_latitude";
public static $column_long = "device_longitude";
public static $column_altitude = "device_altitude";
public static $table_name_type = "device_types";
public static $column_type_id = "device_type";
@ -51,7 +52,9 @@ class MariaDBDeviceRepository implements IDeviceRepository {
{$s("column_device_id")} AS id,
{$s("column_device_name")} AS name,
{$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")}";
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_lat")} AS latitude,
{$s("table_name")}.{$s("column_long")} AS longitude,
{$s("table_name")}.{$s("column_altitude")} AS altitude,
{$s("table_name_type")}.*
FROM {$s("table_name")}
JOIN {$s("table_name_type")} ON

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

Loading…
Cancel
Save