Add presence-sensor category (#1024)

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
GladysAssistant · Dec 21, 2020 · 0d8e2c9 · 0d8e2c9
1 parent 9024d4b
commit 0d8e2c9
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/front/src/components/boxs/device-in-room/device-features/SensorDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/SensorDeviceFeature.jsx
@@ -8,7 +8,12 @@ dayjs.extend(relativeTime);
 
 import { DEVICE_FEATURE_UNITS, DEVICE_FEATURE_CATEGORIES } from '../../../../../../server/utils/constants';
 
-const SPECIAL_SENSORS = [DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR, DEVICE_FEATURE_CATEGORIES.MOTION_SENSOR];
+const SPECIAL_SENSORS = [
+  DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR,
+  DEVICE_FEATURE_CATEGORIES.MOTION_SENSOR,
+  DEVICE_FEATURE_CATEGORIES.PRESENCE_SENSOR
+];
+const LAST_SEEN_SENSORS = [DEVICE_FEATURE_CATEGORIES.MOTION_SENSOR, DEVICE_FEATURE_CATEGORIES.PRESENCE_SENSOR];
 
 import { DeviceFeatureCategoriesIcon } from '../../../../utils/consts';
 
@@ -51,7 +56,7 @@ const SensorDeviceType = ({ children, ...props }) => (
         {props.deviceFeature.last_value === 0 && <i class="fe fe-shield-off" />}
       </td>
     )}
-    {props.deviceFeature.category === DEVICE_FEATURE_CATEGORIES.MOTION_SENSOR && (
+    {LAST_SEEN_SENSORS.includes(props.deviceFeature.category) && (
       <td class={cx('text-right', { 'text-nowrap': props.deviceFeature.last_value_changed })}>
         {!props.deviceFeature.last_value_changed && <Text id="dashboard.boxes.devicesInRoom.noValue" />}
         {props.deviceFeature.last_value_changed &&

diff --git a/front/src/config/demo.json b/front/src/config/demo.json
@@ -124,7 +124,8 @@
       [
         {
           "type": "devices-in-room",
-          "room": "kitchen"
+          "room": "kitchen",
+          "device_features": ["main-presence-sensor"]
         }
       ]
     ],
@@ -377,6 +378,18 @@
             "last_value": 340,
             "last_value_changed": "2019-02-12 07:49:07.556 +00:00"
           },
+          {
+            "name": "Presence",
+            "selector": "main-presence-sensor",
+            "category": "presence-sensor",
+            "type": "push",
+            "unit": null,
+            "min": 0,
+            "max": 1,
+            "read_only": true,
+            "last_value": 0,
+            "last_value_changed": "2020-12-20 13:49:07.556 +01:00"
+          },
           {
             "name": "Kitchen door",
             "selector": "temperature-living-room-celsius",

diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
@@ -1234,6 +1234,10 @@
       "push": "Motion (push)",
       "binary": "Motion (binary)"
     },
+    "presence-sensor": {
+      "shortCategoryName": "Presence sensor",
+      "push": "Presence"
+    },
     "light-sensor": {
       "shortCategoryName": "Luminosity sensor",
       "integer": "Luminosity (integer)",

diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
@@ -1234,6 +1234,10 @@
       "push": "Détecteur de mouvement",
       "binary": "Détection mouvement Oui/Non"
     },
+    "presence-sensor": {
+      "shortCategoryName": "Détecteur de présence",
+      "push": "Présence"
+    },
     "light-sensor": {
       "shortCategoryName": "Capteur de luminosité",
       "integer": "Luminosité entière",

diff --git a/front/src/utils/consts.js b/front/src/utils/consts.js
@@ -108,6 +108,9 @@ export const DeviceFeatureCategoriesIcon = {
     [DEVICE_FEATURE_TYPES.SENSOR.BINARY]: 'eye',
     [DEVICE_FEATURE_TYPES.SENSOR.PUSH]: 'eye'
   },
+  [DEVICE_FEATURE_CATEGORIES.PRESENCE_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.PUSH]: 'users'
+  },
   [DEVICE_FEATURE_CATEGORIES.SISMIC_SENSOR]: {
     [DEVICE_FEATURE_TYPES.SENSOR.DECIMAL]: 'activity'
   },

diff --git a/server/utils/constants.js b/server/utils/constants.js
@@ -254,6 +254,7 @@ const DEVICE_FEATURE_CATEGORIES = {
   CO2_SENSOR: 'co2-sensor',
   COUNTER_SENSOR: 'counter-sensor',
   LEAK_SENSOR: 'leak-sensor',
+  PRESENCE_SENSOR: 'presence-sensor',
   CAMERA: 'camera',
   SWITCH: 'switch',
   SIREN: 'siren',