Aggiunta ed ultimata funzione di elimnazione dei dati inseriti

MarioTurco · Sep 1, 2020 · f7444c2 · f7444c2
1 parent 35ed121
commit f7444c2
Show file tree

Hide file tree

Showing 11 changed files with 244 additions and 6 deletions.
diff --git a/src/delete.html b/src/delete.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Gym Utils</title>
+    <link rel="stylesheet" href="index.css">
+    <script defer src="delete.js"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
+  </head>
+  <body>
+    <div class="container is-fluid">
+
+
+      <div class="tabs is-centered">
+        <ul>
+          <li id="addTab"><a>Aggiungi</a></li>
+          <li id="visualizeTab" ><a>Visualizza</a></li>
+          <li id="editTab" ><a>Modifica</a></li>
+          <li id="deleteTab" class="is-active"><a>Elimina</a></li>
+          <li id="settingsTab"><a>Impostazioni</a></li>
+        </ul>
+      </div>
+      <div class="has-text-centered">
+        <p>Seleziona un campo e poi clicca elimina</p>
+      </div>
+      <div class="table-container " >
+        <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="visualizeTable">
+          <thread >
+            <th>Data</th>
+            <th>Peso</th>
+          </thread>
+          <tbody>
+          </tbody>
+        </table>
+      </div>
+        <div class="has-text-centered">
+          <button class="button is-danger is-outlined" id="deleteRowBtn">
+            <span>Elimina</span>
+            <span class="icon is-small">
+            <i class="fas fa-times"></i>
+            </span>
+          </button>
+        </div>
+    </div>
+  </body>
+</html>
diff --git a/src/delete.js b/src/delete.js
@@ -0,0 +1,87 @@
+const db = require('electron-db');
+const { app, BrowserWindow } = require('electron');
+const { ipcRenderer } = require('electron')
+
+//Tabs
+const visualizeTab = document.getElementById('visualizeTab');
+const settingsTab = document.getElementById('settingsTab')
+const addTab = document.getElementById('addTab');
+const editTab = document.getElementById('editTab');
+
+//Table
+const table = document.getElementById('visualizeTable');
+
+//Buttons
+const deleteRowBtn = document.getElementById('deleteRowBtn');
+
+var lastSelectedRow = null;
+
+deleteRowBtn.onclick = () =>{
+    deselectEffect(lastSelectedRow);
+    var date = lastSelectedRow.getElementsByTagName('td')[0].textContent;
+    db.deleteRow('peso', {'data': date}, (succ, msg) => {
+        console.log(msg);
+      });
+    location.reload(); 
+}
+
+function selectEffect(row){
+    if(row != null)
+        row.classList.add('is-selected');
+}
+function deselectEffect(row){
+    if(row != null)
+        if ( row.classList.contains('is-selected') )
+            row.classList.remove('is-selected');
+
+}
+
+
+function fillTable(){
+    db.getAll('peso',(succ, data) => {
+        console.log(data);
+        let index = 1;
+        //create row
+        for(elems in data){
+            var row = table.insertRow(index);
+            var dataCell = row.insertCell(0);
+            var pesoCell = row.insertCell(1);
+            dataCell.innerHTML =  data[elems].data;
+            pesoCell.innerHTML = data[elems].peso;
+            index+=1;
+        }
+        return data;
+      })
+}
+function addRowsListeners(){
+    console.log('Aggiungedo listeners');
+    var rows = table.getElementsByTagName("tr");
+    for(i=0; i<rows.length;i++){
+        var currentRow = table.rows[i];
+        var createClickListener = function(row){
+            return function(){
+                deselectEffect(lastSelectedRow);
+                selectEffect(row);
+                lastSelectedRow = row;
+            }
+            }
+            currentRow.onclick = createClickListener(currentRow);
+    }
+}
+
+visualizeTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'visualize');
+};
+
+settingsTab.onclick = () => {
+    ipcRenderer.sendSync('synchronous-message', 'settings');
+};
+addTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'add');
+}
+editTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'edit');
+}
+
+fillTable();
+addRowsListeners();
diff --git a/src/edit.html b/src/edit.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Gym Utils</title>
+    <link rel="stylesheet" href="index.css">
+    <script defer src="edit.js"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
+  </head>
+  <body>
+    <div class="container is-fluid">
+
+
+      <div class="tabs is-centered">
+        <ul>
+          <li id="addTab"><a>Aggiungi</a></li>
+          <li id="visualizeTab" ><a>Visualizza</a></li>
+          <li id="editTab" class="is-active"><a>Modifica</a></li>
+          <li id="deleteTab"><a>Elimina</a></li>
+          <li id="settingsTab"><a>Impostazioni</a></li>
+        </ul>
+      </div>
+
+      Edit
+      <div class="table-container " >
+        <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="visualizeTable">
+          <thread >
+            <th>Data</th>
+            <th>Peso</th>
+          </thread>
+          <tbody >
+          </tbody>
+        </table>
+      </div>
+
+      <canvas id="chart" ></canvas>
+
+      </canva>
+    </div>
+  </body>
+</html>
diff --git a/src/edit.js b/src/edit.js
@@ -0,0 +1,25 @@
+const db = require('electron-db');
+const { app, BrowserWindow } = require('electron');
+const { ipcRenderer } = require('electron')
+
+
+//Tabs
+const visualizeTab = document.getElementById('visualizeTab');
+const settingsTab = document.getElementById('settingsTab')
+const addTab = document.getElementById('addTab');
+const deleteTab = document.getElementById('deleteTab');
+
+//Tabs listeners
+visualizeTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'visualize');
+};
+
+settingsTab.onclick = () => {
+    ipcRenderer.sendSync('synchronous-message', 'settings');
+};
+addTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'add');
+}
+deleteTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'delete');
+}
diff --git a/src/index.html b/src/index.html
@@ -14,6 +14,8 @@
         <ul>
           <li id="addTab" class="is-active"><a>Aggiungi</a></li>
           <li id="visualizeTab"><a>Visualizza</a></li>
+          <li id="editTab"><a>Modifica</a></li>
+          <li id="deleteTab"><a>Elimina</a></li>
           <li id="settingsTab"><a>Impostazioni</a></li>
         </ul>
       </div>

diff --git a/src/index.js b/src/index.js
@@ -25,7 +25,7 @@ const createWindow = () => {
   mainWindow.loadFile(path.join(__dirname, 'index.html'));
 
   // Open the DevTools.
-  //mainWindow.webContents.openDevTools();
+  mainWindow.webContents.openDevTools();
 };
 
 // This method will be called when Electron has finished
@@ -72,5 +72,11 @@ ipcMain.on('synchronous-message', (event, arg) => {
   if(arg == 'settings'){
     mainWindow.loadFile(path.join(__dirname, 'settings.html'));
   }
+  if(arg == 'edit'){
+    mainWindow.loadFile(path.join(__dirname, 'edit.html'));
+  }
+  if(arg == 'delete'){
+    mainWindow.loadFile(path.join(__dirname, 'delete.html'));
+  }
   event.returnValue = 'pong'
 })
diff --git a/src/logic.js b/src/logic.js
@@ -8,6 +8,8 @@ const addBtn = document.getElementById('addBtn');
 //Tabs
 const visualizeTab = document.getElementById('visualizeTab');
 const settingsTab = document.getElementById('settingsTab')
+const editTab = document.getElementById('editTab');
+const deleteTab = document.getElementById('deleteTab');
 
 function createDatabase(){
     db.createTable('peso',  (succ, msg) => {
@@ -51,7 +53,10 @@ function pesoError(){
 
 addBtn.onclick = () => {
     let record = new Object();
-    record.data =document.getElementById('dataText').value;
+    tmp = document.getElementById('dataText').value;
+
+    record.data = tmp.substring(8,11) + '-' + tmp.substring(5,7) + '-' + tmp.substring(0,4);
+    console.log("Data:" , record.data);
     record.peso = document.getElementById('pesoText').value;
     if(record.data == '' || record.peso == ''){
         console.log("Vuoto");
@@ -64,6 +69,7 @@ addBtn.onclick = () => {
 
     try{
         if( db.valid('peso') ){
+
             insertRecord(record);
         }
     } catch(error){
@@ -76,12 +82,17 @@ addBtn.onclick = () => {
 
 
 
-
 //Tabs listeners
 visualizeTab.onclick = () =>{
     ipcRenderer.sendSync('synchronous-message', 'visualize');
 };
 
 settingsTab.onclick = () => {
     ipcRenderer.sendSync('synchronous-message', 'settings');
-};
+};
+editTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'edit');
+}
+deleteTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'delete');
+}
diff --git a/src/settings.html b/src/settings.html
@@ -14,6 +14,8 @@
         <ul>
           <li id="addTab"><a>Aggiungi</a></li>
           <li id="visualizeTab" ><a>Visualizza</a></li>
+          <li id="editTab"><a>Modifica</a></li>
+          <li id="deleteTab"><a>Elimina</a></li>
           <li id="settingsTab" class="is-active"><a>Impostazioni</a></li>
         </ul>
       </div>

diff --git a/src/settingsLogic.js b/src/settingsLogic.js
@@ -13,7 +13,12 @@ addTab.onclick = () =>{
 visualizeTab.onclick = () =>{
     ipcRenderer.sendSync('synchronous-message', 'visualize');
 };
-
+editTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'edit');
+}
+deleteTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'delete');
+}
 //Buttons
 const resetBtn = document.getElementById('resetBtn');
 

diff --git a/src/visualize.html b/src/visualize.html
@@ -17,6 +17,8 @@
         <ul>
           <li id="addTab"><a>Aggiungi</a></li>
           <li id="visualizeTab" class="is-active"><a>Visualizza</a></li>
+          <li id="editTab"><a>Modifica</a></li>
+          <li id="deleteTab"><a>Elimina</a></li>
           <li id="settingsTab"><a>Impostazioni</a></li>
         </ul>
       </div>

diff --git a/src/visualizeLogic.js b/src/visualizeLogic.js
@@ -5,6 +5,8 @@ const db = require('electron-db');
 //Tabs
 const addTab = document.getElementById('addTab');
 const settingsTab = document.getElementById('settingsTab');
+const editTab = document.getElementById('editTab');
+const deleteTab = document.getElementById('deleteTab');
 
 //Table
 const table = document.getElementById('visualizeTable');
@@ -18,7 +20,12 @@ addTab.onclick = () =>{
 settingsTab.onclick = () => {
     ipcRenderer.sendSync('synchronous-message', 'settings');
 };
-
+editTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'edit');
+}
+deleteTab.onclick = () =>{
+    ipcRenderer.sendSync('synchronous-message', 'delete');
+}
 //Canvas
 var ctx = document.getElementById('chart').getContext('2d');