From 23b406589611fbbe33a7389491dfdaf85fc7cce5 Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Tue, 30 Jan 2024 19:06:20 +0100
Subject: [PATCH] feat: update devices

---
 .../src/components/devices/DeviceBadge.vue    | 72 ++++++++-----------
 .../components/devices/UpdateDevicePopup.vue  |  5 +-
 frontend/src/views/DevicesView.vue            |  7 +-
 3 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/frontend/src/components/devices/DeviceBadge.vue b/frontend/src/components/devices/DeviceBadge.vue
index 2a7f0e70a..1092160f6 100644
--- a/frontend/src/components/devices/DeviceBadge.vue
+++ b/frontend/src/components/devices/DeviceBadge.vue
@@ -2,10 +2,10 @@
 import type { Device, Sensor, Camera } from '@domain/device/core'
 import { Measure, DeviceType } from '@domain/device/core'
 import { getMeasureColor } from '@/utils/MeasureUtils'
-import { ref } from "vue";
-import UpdateDevicePopup from "@/components/devices/UpdateDevicePopup.vue";
-import RequestHelper, { monitoringHost, monitoringPort } from "@/utils/RequestHelper";
-import { MeasureConverter } from "domain/dist/utils";
+import { ref } from 'vue'
+import UpdateDevicePopup from '@/components/devices/UpdateDevicePopup.vue'
+import RequestHelper, { monitoringHost, monitoringPort } from '@/utils/RequestHelper'
+import { MeasureConverter } from 'domain/dist/utils'
 
 defineProps<{
   device: Device
@@ -13,56 +13,40 @@ defineProps<{
 
 const updatePopupVisible = ref<boolean>(false)
 
-const openPopup = (device: Device) => {
-  updatePopupVisible.value = true
-  console.log(device)
-}
-
 const updateSensor = async (sensor: Sensor) => {
-  console.log("sensor")
-  console.log(sensor)
-  console.log({
+  await RequestHelper.put(`http://${monitoringHost}:${monitoringPort}/devices/sensors`, {
     code: sensor.deviceId.code,
     ipAddress: sensor.ipAddress,
     intervalMillis: sensor.intervalMillis,
     measures: sensor.measures.map((m: Measure) => {
       return MeasureConverter.convertToString(m)
-    })})
-    await RequestHelper.put(`http://${monitoringHost}:${monitoringPort}/devices/sensors`, {
-      code: sensor.deviceId.code,
-      ipAddress: sensor.ipAddress,
-      intervalMillis: sensor.intervalMillis,
-      measures: sensor.measures.map((m: Measure) => {
-        return MeasureConverter.convertToString(m)
-      })
     })
-      .then(async (res: any) => {
-        alert("devo aggiornare i devices")
-        //TODO A CONFIRM POPUP
-       // await getSensors()
-      })
-      .catch(error => {
-        console.log(error)
-      })
+  })
+    .then(async (res: any) => {
+      alert('devo aggiornare i devices')
+      //TODO A CONFIRM POPUP
+    })
+    .catch(error => {
+      console.log(error)
+    })
 }
 
 const updateCamera = async (camera: Camera) => {
-    await RequestHelper.put(`http://${monitoringHost}:${monitoringPort}/devices/cameras`, {
-      code: camera.deviceId.code,
-      ipAddress: camera.ipAddress,
-      resolution: {
-        width: parseInt(camera.resolution.width.toString()),
-        height: parseInt(camera.resolution.height.toString())
-      }
+  await RequestHelper.put(`http://${monitoringHost}:${monitoringPort}/devices/cameras`, {
+    code: camera.deviceId.code,
+    ipAddress: camera.ipAddress,
+    resolution: {
+      width: parseInt(camera.resolution.width.toString()),
+      height: parseInt(camera.resolution.height.toString())
+    }
+  })
+    .then(async (res: any) => {
+      alert('devo aggiornare i devices')
+      //TODO A CONFIRM POPUP
+    })
+    .catch(error => {
+      console.log(error)
     })
-      .then(async (res: any) => {
-        alert("devo aggiornare i devices")
-        //TODO A CONFIRM POPUP
-        //await getCameras()
-      })
-      .catch(error => {
-        console.log(error)
-      })
 }
 </script>
 
@@ -108,7 +92,7 @@ const updateCamera = async (camera: Camera) => {
           <q-tooltip :offset="[0, 8]">Enable</q-tooltip>
         </div>
         <div>
-          <q-btn color="secondary" icon="edit" @click="updatePopupVisible = true"/>
+          <q-btn color="secondary" icon="edit" @click="updatePopupVisible = true" />
           <q-tooltip :offset="[0, 8]">Edit</q-tooltip>
         </div>
         <div>
diff --git a/frontend/src/components/devices/UpdateDevicePopup.vue b/frontend/src/components/devices/UpdateDevicePopup.vue
index f77186d1d..cca162a7a 100644
--- a/frontend/src/components/devices/UpdateDevicePopup.vue
+++ b/frontend/src/components/devices/UpdateDevicePopup.vue
@@ -51,7 +51,10 @@ const updateDevice = () => {
     const updatedCamera: Camera = deviceFactory.createCamera(
       deviceIdFactory.createCameraId(device.deviceId.code),
       device.ipAddress,
-      resolutionFactory.createResolution((device as Camera).resolution.width, (device as Camera).resolution.height)
+      resolutionFactory.createResolution(
+        (device as Camera).resolution.width,
+        (device as Camera).resolution.height
+      )
     )
     emit('update-camera', updatedCamera)
   }
diff --git a/frontend/src/views/DevicesView.vue b/frontend/src/views/DevicesView.vue
index 4feb5e9df..1060e396b 100644
--- a/frontend/src/views/DevicesView.vue
+++ b/frontend/src/views/DevicesView.vue
@@ -15,14 +15,11 @@ import {
   EnvironmentDataFactoryImpl,
   ResolutionFactoryImpl
 } from '@domain/device/factories'
-import type { Camera, Device, Sensor } from "@domain/device/core";
+import type { Camera, Device, Sensor } from '@domain/device/core'
 import { Measure } from '@domain/device/core'
 import NewDevicePopup from '@/components/devices/NewDevicePopup.vue'
 import RequestHelper, { monitoringHost, monitoringPort } from '@/utils/RequestHelper'
 import { MeasureConverter } from 'domain/dist/utils'
-import UpdateDevicePopup from "@/components/devices/UpdateDevicePopup.vue";
-
-const environmentDataFactory: EnvironmentDataFactory = new EnvironmentDataFactoryImpl()
 
 const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
 const deviceFactory: DeviceFactory = new DeviceFactoryImpl()
@@ -149,7 +146,6 @@ onMounted(async () => {
 })
 
 const newPopupVisible = ref<boolean>(false)
-
 </script>
 
 <template>
@@ -183,7 +179,6 @@ const newPopupVisible = ref<boolean>(false)
     @insert-sensor="insertSensor"
     @insert-camera="insertCamera"
   ></new-device-popup>
-
 </template>
 
 <style scoped lang="scss">