From 0252681847fc138f83729d2f77480b4c26d26b2f Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Tue, 7 Nov 2023 09:12:45 +0300
Subject: [PATCH] removed is_logging column

---
 controllers/modbus.controller.js   |   7 +++----
 data.db                            | Bin 20480 -> 20480 bytes
 getslaves.sql                      |   1 -
 index.d.ts                         |   1 -
 migrations/001-init.sql            |  11 +++++------
 public/index.html                  |  11 +----------
 public/js/app.js                   |   2 --
 services/modbus.service.js         |   2 +-
 validators/modbus-device.schema.js |   1 -
 9 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/controllers/modbus.controller.js b/controllers/modbus.controller.js
index 7eaffe2..a521f5f 100644
--- a/controllers/modbus.controller.js
+++ b/controllers/modbus.controller.js
@@ -60,7 +60,7 @@ export const modbusController = {
    */
   async createDevice(req, res, next) {
     try {
-      const { id, name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label, is_logging } =
+      const { id, name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label } =
         req.body;
       await db.run(
         `INSERT INTO "modbus_slaves" (
@@ -69,10 +69,9 @@ export const modbusController = {
                     "g_display_reg_addr", 
                     "g_display_reg_format",
                     "g_display_reg_type",
-                    "g_y_label", 
-                    "is_logging") 
+                    "g_y_label") 
                     VALUES (?, ?, ?, ?, ?, ?, ?)`,
-        [id, name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label, is_logging],
+        [id, name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label],
       );
       return res.status(200).json({ message: "Device created." });
     } catch (error) {
diff --git a/data.db b/data.db
index bdf8a2fe655a33081caed91669888f2e3b5aa398..44fe851a4a21b9728c462632f5756feea9ccdd3d 100644
GIT binary patch
delta 346
zcmZozz}T>Wae}nq9|i^nRv?A~MxBW|#-e{1^wM7P0)<#O^cnagdD6K2IrKLhD)g~4
zu}4m3;n3d1p~%E3!pttNuFlw=zFCXwC*$TIo-NEQHyD_2Y;0_2=HV%15M3|W<e!<B
zSu%N{ur=QdRYrCO(Y5tZp^w5Ln?DN6vQ7@-5t*zcuDH2KvYlx%yNtzTCmDmur9iww
z#&Gi;84YF`9=`7k{BQYh^PlA3#=n?<0)GvE27f5O5x*$k_sxO^*ZDSo*W(xD>SW-5
z$bX1`5q~F8u#&%AoQ0i19_R;Ym(;S%<WvP^6Q9JS)Eos9IcA^)qo62U!kF1JDAd!?
i3?gqV%LJ6?M3OfGNgEqMq>W^O{*dQDk~T!vZ3qA}iCV@0

delta 539
zcmZozz}T>Wae}nqHwFd<Rv?A~Mumww#v<Ps^wM7P0)<#O7#R2?dD6HPI5sOP^s;Z(
z=TKzgbY^B3S6653aNQiq^^;LsDYG~}CqF$sGcR39!O7p>$JNnK!OuTL!7tRuN5RF_
z%`wy`M8VC`C)jnfAI}bEmVO52{*8^T%p5cF7}*&_*9&fbAY9H$iaC@0cqBGwORiwz
z)lopQezK5^C9{r#;bd<a12A0;rVS>qmN5kK4L0AA(O_2L<2%Q||CawY|4IIB{EPV~
z@YnEX@Q3mn@r&|(=X=C=j&BFwN}z9B_`F4gnK%SRLxMvX?s)=3Lrk2JQBbrbwYbEX
zS<=NH<W(U)pa+1W!XQy*e$OCJLo;Dsh!|KUvz&`3Na5!1di;VstqlAR_z&>U=WpfD
z*(_)f%U>@k${;ApE1sF1o#`1A3e=sJm{Xi80StI~ppDWTE~#ai$*Bs;CO(NtsW}QJ
z^2|UPpeqnE#>^0n5Cz6^Oh5&kKn0vItwtbuV<U*XksKpX9_TBGyb#E2Lu3OC0sKgY
ABme*a

diff --git a/getslaves.sql b/getslaves.sql
index 4e96fed..86b0b2d 100644
--- a/getslaves.sql
+++ b/getslaves.sql
@@ -4,7 +4,6 @@ SELECT
 		g_display_reg_addr,
 		g_display_reg_format,
 		g_y_label,
-		is_logging,
 		CASE
 			WHEN COUNT(dv.id) = 0 THEN '[]'
 			ELSE '[' || GROUP_CONCAT(
diff --git a/index.d.ts b/index.d.ts
index 369ca53..47f4d9b 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -30,7 +30,6 @@ export type ModbusDevice = {
   g_display_reg_format: NumberType | null;
   g_display_reg_type: "HR" | "IR";
   g_y_label: string | null;
-  is_logging: boolean;
   display_values?: DisplayValue[]
 }
 
diff --git a/migrations/001-init.sql b/migrations/001-init.sql
index 08f6fa3..dc2da23 100644
--- a/migrations/001-init.sql
+++ b/migrations/001-init.sql
@@ -25,7 +25,6 @@ CREATE TABLE IF NOT EXISTS "modbus_slaves" (
 	"g_display_reg_type" VARCHAR(3) CHECK(g_display_reg_type IN("HR", "IR")) DEFAULT "IR",
 	"g_display_reg_format" VARCHAR(5) CHECK(g_display_reg_format IN("UI16", "I16", "UI32", "I32", "FP32")) DEFAULT "UI16",
 	"g_y_label" VARCHAR(40) DEFAULT "Label",
-	"is_logging" BOOLEAN NOT NULL DEFAULT FALSE,
 	PRIMARY KEY("id")
 );
 
@@ -56,12 +55,12 @@ CREATE TABLE IF NOT EXISTS "display_values" (
 -- )
 
 INSERT INTO "modbus_slaves" (
-	"id", "name", "g_display_reg_addr", "g_display_reg_type", "g_display_reg_format", "g_y_label", "is_logging"
+	"id", "name", "g_display_reg_addr", "g_display_reg_type", "g_display_reg_format", "g_y_label"
 ) VALUES
-	(1, "Device #1", 0, "IR", "UI16", "Label 1", 1),
-	(2, "Device #2", 1, "IR", "UI32", "Label 2", 1),
-	(3, "Device #3", 3, "IR", "UI16", "Label 3", 0),
-	(4, "Device #4", NULL, NULL, NULL, "Label 4", 0);
+	(1, "Device #1", 0, "IR", "UI16", "Label 1"),
+	(2, "Device #2", 1, "IR", "UI32", "Label 2"),
+	(3, "Device #3", 3, "IR", "UI16", "Label 3"),
+	(4, "Device #4", NULL, NULL, NULL, "Label 4");
 
 INSERT INTO "display_values" (
 	"id", "name", "slave_id", "reg_addr", "reg_format", "reg_type"
diff --git a/public/index.html b/public/index.html
index f0da556..0933531 100644
--- a/public/index.html
+++ b/public/index.html
@@ -66,7 +66,7 @@
                       <hr />
                       <form @submit.prevent="create(() => graphView = 'none')" action="#">
                         <div
-                          x-id="['id', 'name', 'graph-display', 'g_display_reg_addr', 'g_display_reg_format', 'g_y_label', 'is_logging']"
+                          x-id="['id', 'name', 'graph-display', 'g_display_reg_addr', 'g_display_reg_format', 'g_y_label']"
                           class="flex flex-col space-y-2"
                         >
                           <div>
@@ -158,15 +158,6 @@
                                 <option value="FP32">Floating Point 32</option>
                               </select>
                             </div>
-                            <div>
-                              <input
-                                x-model="data.is_logging"
-                                :id="$id('is_logging')"
-                                name="is_logging"
-                                type="checkbox"
-                              />
-                              <label :for="$id('is_logging')">Logging</label>
-                            </div>
                           </div>
                         </div>
                         <div>
diff --git a/public/js/app.js b/public/js/app.js
index 4e02844..fb76336 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -70,7 +70,6 @@ document.addEventListener("alpine:init", async () => {
       g_display_reg_format: "UI16",
       g_display_reg_type: "IR",
       g_y_label: "",
-      is_logging: false,
     },
     resetDataFields() {
       this.data.id = null;
@@ -79,7 +78,6 @@ document.addEventListener("alpine:init", async () => {
       this.data.g_display_reg_format = "UI16";
       this.g_display_reg_type = "IR";
       this.data.g_y_label = "";
-      this.data.is_logging = false;
     },
     async create(cb) {
       try {
diff --git a/services/modbus.service.js b/services/modbus.service.js
index 9afa17d..ee8655f 100644
--- a/services/modbus.service.js
+++ b/services/modbus.service.js
@@ -123,7 +123,7 @@ export const modbusService = {
   async getDevices() {
     /** @type {import("..").ModbusDevice[]}  */
     const devices = await db.all(`
-        SELECT  ms.id AS id, ms.name AS name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label, is_logging,
+        SELECT  ms.id AS id, ms.name AS name, g_display_reg_addr, g_display_reg_format, g_display_reg_type, g_y_label,
         CASE
           WHEN COUNT(dv.id) = 0 THEN '[]'
           ELSE '[' || GROUP_CONCAT(
diff --git a/validators/modbus-device.schema.js b/validators/modbus-device.schema.js
index f5f9507..e5a892d 100644
--- a/validators/modbus-device.schema.js
+++ b/validators/modbus-device.schema.js
@@ -7,7 +7,6 @@ export const modbusDeviceSchema = object({
   g_display_reg_format: string().oneOf(["UI16", "I16", "UI32", "I32", "FP32"]).nullable(),
   g_display_reg_type: string().oneOf(["HR", "IR"]).nullable(),
   g_y_label: string().max(40).nullable(),
-  is_logging: boolean().required()
 });
 
 export const removeModbusDeviceSchema = modbusDeviceSchema.pick(['id']);
\ No newline at end of file