CIM69 - car database

assets/functions.php

@@ -2048,4 +2048,47 @@ function getQuestions($type){
     $view .= '</div>';
     }
   }
+}
+// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// convert cartest from history to cartest table
+// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+function convertCartest(){
+
+include dirname(__FILE__,2).'/settings/settings.php';
+
+//GET CARTEST FROM HISTORY TABLE
+$pdo = dbConnect($dbname);
+$sql = 'SELECT * FROM history WHERE type="cartest"';
+$stmt = $pdo->prepare($sql);
+//Excute Query
+$stmt->execute();
+//Get results
+$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+//FOR EACH CARTEST TRANSFER TO CARTEST TABLE
+  foreach ($messages as $message){
+      //GET VARIABLES
+      $cartest = json_decode($message['description'],true);
+      $carbrand = ucfirst($cartest["CarBrand"]);
+      $cartype = ucfirst($cartest["CarType"]);
+      $questions = json_encode($cartest["Questions"] ??'');
+      $datapoints = json_encode($cartest["plugDataPoints"] ?? '');
+
+      //get header data only
+      unset($cartest["Questions"]);
+      unset($cartest["plugDataPoints"]);
+      $header = json_encode($cartest);
+
+      //INSERT INTO CARTEST
+      $sql = 'INSERT INTO cartest (carbrand, cartype,header,questions,datapoints,createdby) VALUES (?,?,?,?,?,?)';
+      $stmt = $pdo->prepare($sql);
+      //Excute Query
+      $stmt->execute([$carbrand,$cartype,$header,$questions,$datapoints,$cartest["NameTester"]]);
+
+      //MARK HISTORY ITEM FOR DELETATION
+      $sql = 'UPDATE history SET type = "delete" WHERE rowID = '.$message['rowID'];
+      $stmt = $pdo->prepare($sql);
+      //Excute Query
+      $stmt->execute();
+  }
 }

assets/readdevice.js

@@ -235,10 +235,18 @@ async function listenToPort() {
 }
 
 const serialResultsDiv = document.getElementById("serialResults");
+const plug_data = document.getElementById("plug_data");
 
 async function appendToTerminal(newStuff) {
     serialResultsDiv.innerHTML += newStuff;
-    serialOutput +=newStuff
+    //vcp_data.value +=newStuff
+    if (typeof plug_data !== "undefined"){
+        var plugdata = {"VCP":{VCP}, "VPP1":{VPP1},"VPP2":{VPP2},"VBAT":{VBAT}, "PWM":{PWM},"STATE":{STATE}, "xChart":{xChart}}
+        plug_data.value = JSON.stringify(plugdata);
+    }
+
+    serialOutput +=newStuff;
+  
 }
 
 
@@ -374,6 +382,37 @@ async function closePort(){
         window.location.reload();
 }
 
+async function closePortCarTest(){
+        
+    reader.cancel();
+    await readableStreamClosed.catch(() => { /* Ignore the error */ });
+    writer.close();
+    await writableStreamClosed 
+    console.log(maintenanceRun);
+    await port.close();
+
+    //Check for errors maintenanceRun = 999
+    if (maintenanceRun != 999){
+        serialResultsDiv.innerHTML = '';
+        
+        if (maintenanceRun !=0){
+            if (value != 33){//Include the correct ROWID of the Productrecord
+                progressBar("100", "Ready", "#04AA6D");
+                }
+            else{
+                progressBar("100", "Ready => Warning: Product requires TESLA adapter", "#ff6666");
+                }
+        
+        }
+        else {
+            progressBar("100", "Ready", "#04AA6D");
+        }
+    }
+
+    maintenanceRun = 0; // reset maintenanceRun
+
+}
+
 async function updateHistory(){
 
     var data = document.getElementById("servicetoken").innerHTML; //get ServiceID