Change build process, version upgrade

ivan770 · Dec 1, 2018 · d975e5b · d975e5b
1 parent c8ce36f
commit d975e5b
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 33 deletions.
diff --git a/construct.html b/construct.html
@@ -8,26 +8,55 @@
 </head>
 
 <body>
-  <table id="build">
-      <thead>
-        <tr>
-            <th>Column</th>
-            <th>Row</th>
-        </tr>
-      </thead>
-
-      <tbody>
-      </tbody>
-    </table>
-    <script>
+  <script src="js/jquery.min.js"></script>
+  <script>
     const electron = require('electron')
     const ipc = require('electron').ipcRenderer
-    ipc.on('build', function(event, arg1, arg2) {
-      build_add(arg1, arg2)
+    ipc.on('build', function(event, json) {
+      document.body.appendChild(buildHtmlTable(json));
     })
     ipc.on('clear', function(event) {
       build_clear()
     })
+    var _table_ = document.createElement('table'),
+    _tr_ = document.createElement('tr'),
+    _th_ = document.createElement('th'),
+    _td_ = document.createElement('td');
+
+    // Builds the HTML Table out of myList json data from Ivy restful service.
+    function buildHtmlTable(json) {
+        var table = _table_.cloneNode(false),
+            columns = addAllColumnHeaders(json, table);
+        for (var i=0, maxi=json.length; i < maxi; ++i) {
+            var tr = _tr_.cloneNode(false);
+            for (var j=0, maxj=columns.length; j < maxj ; ++j) {
+                var td = _td_.cloneNode(false);
+                    cellValue = json[i][columns[j]];
+                td.appendChild(document.createTextNode(json[i][columns[j]] || ''));
+                tr.appendChild(td);
+            }
+            table.appendChild(tr);
+        }
+        return table;
+    }
+
+    function addAllColumnHeaders(json, table)
+    {
+        var columnSet = [],
+            tr = _tr_.cloneNode(false);
+        for (var i=0, l=json.length; i < l; i++) {
+            for (var key in json[i]) {
+                if (json[i].hasOwnProperty(key) && columnSet.indexOf(key)===-1) {
+                    columnSet.push(key);
+                    var th = _th_.cloneNode(false);
+                    th.appendChild(document.createTextNode(key));
+                    tr.appendChild(th);
+                }
+            }
+        }
+        table.appendChild(tr);
+        return columnSet;
+    }
     </script>
     <script src="js/build.js"></script>
     <script type="text/javascript" src="js/materialize.min.js"></script>

diff --git a/index.html b/index.html
@@ -275,7 +275,7 @@
         });
     </script>
     <script src="js/commands.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+    <script src="js/jquery.min.js"></script>
     <script type="text/javascript" src="js/materialize.min.js"></script>
     <script>
         if (window.module) module = window.module;

diff --git a/js/build.js b/js/build.js
@@ -1,11 +1,11 @@
-function build_add (c1, c2) {
-    let table = document.getElementById("build");
-    let row = table.insertRow(1);
-    let cell1 = row.insertCell(0);
-    let cell2 = row.insertCell(1);
-    cell1.innerHTML = `${c1}`;
-    cell2.innerHTML = `${c2}`;
-}
+// function build_add (c1, c2) {
+//     let table = document.getElementById("build");
+//     let row = table.insertRow(1);
+//     let cell1 = row.insertCell(0);
+//     let cell2 = row.insertCell(1);
+//     cell1.innerHTML = `${c1}`;
+//     cell2.innerHTML = `${c2}`;
+// }
 
 function build_clear () {
   let table = document.getElementById("build");

diff --git a/js/commands.js b/js/commands.js
@@ -96,14 +96,8 @@ function querydb(host, user, password, query, database, port, build) {
                             throw err
                         } else {
                             if (build == 1) {
-                              ipc.send("build_clear")
-                                Object.keys(result).forEach(function(key) {
-                                    var row = result[key];
-                                    Object.keys(row).forEach(function(key) {
-                                        // appendLog(key + ' // ' + row[key], "BUILD");
-                                        ipc.send("build", key, row[key])
-                                    });
-                                });
+                                ipc.send("build_clear")
+                                ipc.send("build", result);
                                 appendLog("Build completed!", "BUILD")
                                 exec1 = performance.now()
                                 exectime.innerText = "query: " + Math.round((exec1 - exec0)) + " ms";

diff --git a/js/jquery.min.js b/js/jquery.min.js
diff --git a/main.js b/main.js
@@ -147,6 +147,7 @@ app.on('activate', function() {
 ipc.on('developer', function(event) {
     mainWindow.webContents.openDevTools()
     settingsWin.webContents.openDevTools()
+    assistantWin.webContents.openDevTools()
 })
 
 ipc.on('exit', function(event) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pinesql",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "Electron-based SQL editor",
   "productName": "PineSQL",
   "main": "./main.js",