From cdfa6d09bbd11ab1980af76cf74aabae1e6e059d Mon Sep 17 00:00:00 2001
From: bogd <bogd@live.ru>
Date: Thu, 16 May 2024 15:07:37 +0200
Subject: [PATCH] time card reworked

---
 cards/AstroTimerCard.vue | 104 ---------------------------------------
 cards/SNTPCard.vue       |  37 +++++++-------
 2 files changed, 20 insertions(+), 121 deletions(-)
 delete mode 100644 cards/AstroTimerCard.vue

diff --git a/cards/AstroTimerCard.vue b/cards/AstroTimerCard.vue
deleted file mode 100644
index 3258c99..0000000
--- a/cards/AstroTimerCard.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <q-card flat class="card">
-    <q-card-section>
-      <div class="text-h6">ASTRO Scheduler</div>
-    </q-card-section>
-    <q-card-section class="q-pt-none">
-      <div class="row">
-        <div class="q-pa-md col-6"><q-input v-model="data.astrorecs.lat" label="LAT" /></div>
-        <div class="q-pa-md col-6"><q-input v-model="data.astrorecs.lon" label="LON" /></div>
-      </div>
-    </q-card-section>
-    <q-card-section class="q-pt-none">
-      <q-expansion-item flat v-for="astrorec in data.astrorecs.records" :key="astrorec.num"
-        :label="list_header(astrorec)" v-show="!astrorec.del">
-        <q-card flat bordered>
-          <q-card-section class="q-pt-none">
-            <div><q-toggle v-model="astrorec.enab" :true-value=1 :false-value=0>Task enabled</q-toggle>
-            </div>
-            <div><q-toggle v-model="astrorec.rise" :true-value=1 :false-value=0>
-                {{ (astrorec.rise) ? 'Sunrise' : 'Sunset' }}</q-toggle></div>
-            <div><q-toggle v-model="astrorec.sensor_enab" :true-value=1 :false-value=0>Light sensor</q-toggle></div>
-            <div class="row" v-if="astrorec.sensor_enab" style="align-items: center;">
-              <div class="q-pa-xs col-6"><q-input v-model="astrorec.sensor_angle" label="Sensor Sun angle" /></div>
-              <div class="q-pa-xs col-6 text-h6">{{ min_to_str(astrorec.sensor_time) }}</div>
-            </div>
-            <div class="row" style="align-items: center;">
-              <div class="q-pa-xs col-6"><q-input v-model="astrorec.main_angle" label="Main Sun angle" /></div>
-              <div class="q-pa-xs col-6 text-h6">{{ min_to_str(astrorec.main_time) }}</div>
-            </div>
-            <q-input v-model="astrorec.name" label="Task name" />
-            <q-input v-model="astrorec.exec" label="Execute command" />
-          </q-card-section>
-          <q-card-actions>
-            <q-btn class="btn" flat v-on:click="ApplyAstroRecord(astrorec.num)">Save task</q-btn>
-            <q-btn class="btn" flat v-on:click="DeleteAstroRecord(astrorec.num)">Delete task</q-btn>
-          </q-card-actions>
-        </q-card>
-      </q-expansion-item>
-    </q-card-section>
-    <q-card-actions>
-      <div class="q-pa-md">
-        <q-btn class="btn" flat v-on:click="AddAstroRecord">Add task</q-btn>
-      </div>
-    </q-card-actions>
-  </q-card>
-</template>
-
-<script setup>
-import { reactive, computed } from "vue";
-import { PostData } from "components/webguicomp/network";
-import { ShowDelayDialog } from "components/webguicomp/helpers";
-
-function min_to_str(min) {
-  return `${Math.floor(min / 60)}h ${min % 60}m`
-}
-
-function list_header(rec) {
-  return `Task ${rec.num} [${rec.name}]`;
-}
-
-function initrecs() {
-  let out = [], rec, i;
-  for (i = 1; i <= 16; i++) {
-    rec = {
-      num: i, del: 1, enab: 1, rise: 1, sensor_enab: 0, sensor_angle: 0,
-      sensor_time: 0, main_angle: 0, main_time: 0, name: "", exec: "",
-    }
-    out.push(rec);
-  }
-  return out;
-};
-
-
-const init = {
-  astrorecs: {
-    lat: 0,
-    lon: 0,
-    records: initrecs()
-  }
-}
-
-function ApplyAstroRecord() {
-  PostData(data, 1, 1, null);
-}
-
-function DeleteAstroRecord(num) {
-  data.astrorecs.records[num - 1].del = 1;
-  ApplyAstroRecord(num);
-}
-
-function AddAstroRecord() {
-  for (let i = 0; i < 16; i++) {
-    if (data.astrorecs.records[i].del == 1) {
-      data.astrorecs.records[i].del = 0;
-      data.astrorecs.records[i].enab = 0;
-      ApplyAstroRecord(i + 1);
-      break;
-    }
-  }
-}
-
-const data = reactive(init);
-PostData(data, 2, 0, null);
-</script>
diff --git a/cards/SNTPCard.vue b/cards/SNTPCard.vue
index 22827b4..d721332 100644
--- a/cards/SNTPCard.vue
+++ b/cards/SNTPCard.vue
@@ -1,7 +1,7 @@
 <template>
   <q-card flat class="card">
     <q-card-section>
-      <div class="text-h6">SNTP</div>
+      <div class="text-h6">TIME</div>
     </q-card-section>
     <q-card-section class="q-pt-none">
       <div class="q-pa-md">
@@ -10,33 +10,35 @@
           <q-input v-model="data.sntp_serv1" label="SNTP server 1:" />
           <q-input v-model="data.sntp_serv2" label="SNTP server 2:" />
           <q-input v-model="data.sntp_serv3" label="SNTP server 3:" />
+          <div class="row">
+            <div class="col-6"><q-input v-model="data.lat" label="Latitude" /></div>
+            <div class="q-pl-sm col-6"><q-input v-model="data.lon" label="Longitude" /></div>
+          </div>
+          <div class="row" style="align-items: center;">
+            <div class="col-6"><q-input v-model="data.time" label="Unixtime" /></div>
+            <div class="q-pl-sm col-6"></div>
+          </div>
+          <div>
+            <q-btn flat class="btn" label="Set manual" @click="PostData({ time_set: data.time }, 1, 0);"></q-btn>
+            <q-btn flat class="btn q-ml-sm" label="From system" @click="SetTimeFromSystem"></q-btn>
+          </div>
+
         </div>
       </div>
     </q-card-section>
-    <q-card-section class="q-pt-none">
-      <div class="q-pa-md">
-        <q-btn flat class="btn" label="Set time from system" @click="SetTimeFromSystem"></q-btn>
-      </div>
-    </q-card-section>
-    <q-card-section class="q-pt-none">
-      <div class="row">
-        <div class="q-pa-md col-6"><q-input v-model="data.lat" label="Latitude" /></div>
-        <div class="q-pa-md col-6"><q-input v-model="data.lon" label="Longitude" /></div>
-      </div>
-    </q-card-section>
     <CardActions :senddata="data"></CardActions>
   </q-card>
 </template>
 
 <script setup>
-import { reactive, computed } from "vue";
+import { reactive, computed, ref } from "vue";
 import { PostData } from "components/webguicomp/network";
 import CardActions from "components/webguicomp/CardActions.vue"
 //const timestr = reactive(new Date().toISOString().replace("T", " ").substring(0, 19));
 
 function SetTimeFromSystem() {
-  let time = Math.floor(new Date() / 1000);
-  PostData({ time_set: time }, 1, 0);
+  data.time = Math.floor(new Date() / 1000);
+  PostData({ time_set: data.time }, 1, 0);
 }
 
 const init = {
@@ -45,9 +47,10 @@ const init = {
   sntp_serv3: "",
   sntp_enab: false,
   lat: 0,
-  lon: 0
+  lon: 0,
+  time: 0
 }
-
+const time_data = reactive({ time: 0 });
 const data = reactive(init);
 PostData(data, 2, 0, null);
 </script>