Commit Graph

  • 083858f9cf Merge branch 'Website_websocket' into 'main' Sietse Jonker 2024-03-07 14:20:52 +01:00
  • 866af9253e Add graph documentation sietse jonker 2024-03-07 14:20:21 +01:00
  • 185a972f1b dev page documentation Dano van den Bosch 2024-03-07 14:01:20 +01:00
  • fb304af3a4 Merge branch 'main' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Bram Barbieri 2024-03-07 13:59:03 +01:00
  • c7ee23afd7 Bram docs, daily standups Bram Barbieri 2024-03-07 13:59:01 +01:00
  • 598dd54521 Add new lines for temperature, humidity, eCO2, and TVOC in liveGraph class sietse jonker 2024-03-07 13:18:12 +01:00
  • 9566148fa6 Merge branch 'Website_websocket' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 into Website_websocket Dano van den Bosch 2024-03-07 13:11:03 +01:00
  • 878fb9f491 Refactor JSON parsing and data handling functions Dano van den Bosch 2024-03-07 13:11:01 +01:00
  • 1472c17125 Fix variable name and update amount of nodes sietse jonker 2024-03-07 13:09:28 +01:00
  • d1c962f71c added so the answer text is at the bottom Sam 2024-03-07 13:04:14 +01:00
  • f2964ebce8 added new function to have text automaticly at the bottom Sam 2024-03-07 13:03:58 +01:00
  • 0b8ae0ef34 Refactor main.js: Add descriptions, declare variables, and update loop condition sietse jonker 2024-03-07 13:03:28 +01:00
  • bc8cc500cb Refactor code to dynamically create node data and live graphs sietse jonker 2024-03-07 13:00:22 +01:00
  • 2e394f3d45 Update liveGraphs to include temperature, humidity, eCO2, and TVOC data sietse jonker 2024-03-07 12:57:54 +01:00
  • 6070ba7480 edits css sietse jonker 2024-03-07 11:22:25 +01:00
  • 656cd83aee Refactor CSS styles and remove unnecessary code sietse jonker 2024-03-06 21:27:19 +01:00
  • bd66f21082 Update interval delay and refactor liveGraph creation sietse jonker 2024-03-06 21:16:30 +01:00
  • 36277a7e5d Update file index.html Sietse Jonker 2024-03-06 20:56:19 +01:00
  • 2c0b7df0a1 Refactor HTML structure in index.html sietse jonker 2024-03-06 20:55:43 +01:00
  • 55f94387cc Merge branch 'Website_websocket' into 'main' Sietse Jonker 2024-03-06 20:36:11 +01:00
  • 24164841a9 Merge branch 'main' into 'Website_websocket' Sietse Jonker 2024-03-06 20:35:56 +01:00
  • c14c18deb0 Remove commented out code and update graph in main.js Sietse Jonker 2024-03-06 17:38:09 +01:00
  • f4840775ed Added uml sam 2024-03-06 16:05:31 +01:00
  • 63be84e287 Update graph colors and scale for temperature, eCO2, and TVOC Sietse Jonker 2024-03-06 15:59:54 +01:00
  • 199283d3e0 Add live graph plots for humidity, eCO2, and TVOC Sietse Jonker 2024-03-06 15:51:01 +01:00
  • 27742cfa89 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 sam 2024-03-06 15:46:42 +01:00
  • 5a8e13c0d6 Added class sam 2024-03-06 15:46:39 +01:00
  • 284071b4ee Class creation sam 2024-03-06 15:46:32 +01:00
  • 8ed556d856 Refactor liveGraph class and updateNodeData function Sietse Jonker 2024-03-06 15:38:46 +01:00
  • 951fc64e6d adds graph class Sietse Jonker 2024-03-06 15:03:47 +01:00
  • 65783ac3b6 Add liveGraph class and update index.html Sietse Jonker 2024-03-06 15:02:34 +01:00
  • 9b01523f0e makes class for graphs Sietse Jonker 2024-03-06 15:01:20 +01:00
  • b971fe0b54 dev page documentation added to pages Dano van den Bosch 2024-03-06 11:25:58 +01:00
  • a2219fa03a Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-03-05 16:37:02 +01:00
  • 67d77d59d1 changes html and css for testing class Sietse Jonker 2024-03-05 16:36:58 +01:00
  • db9c984446 adds class for graph Sietse Jonker 2024-03-05 16:36:42 +01:00
  • 026bd92d65 I did it 😊 Dano van den Bosch 2024-03-05 16:03:15 +01:00
  • 698b3055a4 File creation + text centre + split array sam 2024-03-05 16:02:34 +01:00
  • 2b31f80655 File creation sam 2024-03-05 16:02:17 +01:00
  • d3952306b2 Added reset sam 2024-03-05 16:02:12 +01:00
  • de1ae975a4 added code for muliple nodes Dano van den Bosch 2024-03-05 14:46:43 +01:00
  • f99d7b5c3d Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 sam 2024-03-05 14:22:43 +01:00
  • 21ef8604c2 changed asset sam 2024-03-05 14:22:40 +01:00
  • e09651a90c Added asset sam 2024-03-05 14:22:06 +01:00
  • 0886352a1c added script sam 2024-03-05 14:21:57 +01:00
  • 307257eefc Added writetext function sam 2024-03-05 14:21:47 +01:00
  • fba7ada367 Simple button script sam 2024-03-05 14:21:35 +01:00
  • 1596f0c641 Fix grammatical error from dano Sietse Jonker 2024-03-05 14:09:31 +01:00
  • 3ebe661de0 Fix node identification number in webSocket message Dano van den Bosch 2024-03-05 14:03:10 +01:00
  • fed0adb299 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-03-05 13:48:56 +01:00
  • 7476f98590 Commented out debug print statements in webSocketEvent function Sietse Jonker 2024-03-05 13:48:54 +01:00
  • db9380816c added node identivication Dano van den Bosch 2024-03-05 13:42:12 +01:00
  • d127a6001d Add WebSocket connection error handling and JSON in to array Dano van den Bosch 2024-03-05 13:38:09 +01:00
  • bcbb8080c2 Add Arduino code for sensor data collection and websocket communication Sietse Jonker 2024-03-05 11:40:25 +01:00
  • 072752cec8 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-03-05 11:27:31 +01:00
  • 9193a753ce Refactor survey questions and add conclusion Sietse Jonker 2024-03-05 11:27:29 +01:00
  • 902031cfd5 Fixt arduino file location Dano van den Bosch 2024-03-05 10:55:58 +01:00
  • d24744823b Set the websocket data to JSON format Dano van den Bosch 2024-03-05 10:48:15 +01:00
  • 5b26d6b844 Bram documentation buzzers pt 2 Bram Barbieri 2024-03-04 15:28:05 +01:00
  • ce24a782ed Bram Documentation themperature sensors. Bram Barbieri 2024-03-04 14:15:16 +01:00
  • 5d9d377010 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-03-01 14:14:25 +01:00
  • a70575d8b8 adds comments Sietse Jonker 2024-03-01 14:14:24 +01:00
  • 4db11e3035 adds gebruikerstest voor questions enquete Sietse Jonker 2024-03-01 14:14:11 +01:00
  • 20a5446c8c Added UML sam 2024-03-01 14:09:23 +01:00
  • 5c59dc033c Updated documentation sam 2024-03-01 14:00:45 +01:00
  • ff296eefb0 Updated documenation sam 2024-03-01 13:56:17 +01:00
  • 2389c068bf Added new script sam 2024-03-01 13:52:36 +01:00
  • f533e1a9c1 Added to pages sam 2024-03-01 13:52:16 +01:00
  • 7b48a4a04e standup Bram Barbieri 2024-03-01 11:48:30 +01:00
  • d1714fabec Added code for handeling websocket data, And made the html code fariable in a js function Dano van den Bosch 2024-02-29 16:59:04 +01:00
  • eee106a402 name change Bram Barbieri 2024-02-29 15:36:10 +01:00
  • 5f88a8f495 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sam 2024-02-29 14:50:58 +01:00
  • 0d1da4503e Added documentation Sam 2024-02-29 14:50:55 +01:00
  • 14b07da103 daily standup updated Bram Barbieri 2024-02-29 12:37:00 +01:00
  • 9238d9841e test commit Sietse Jonker 2024-02-28 12:09:34 +01:00
  • 734dca30bc fixes interval and stuff Sietse Jonker 2024-02-28 12:06:43 +01:00
  • 503ef68e67 Add dev page and database setup on Raspberry Pi Dano van den Bosch 2024-02-28 11:57:28 +01:00
  • 1d76c5ff7a fixes sgp30 sensor not displaying data sietse jonker 2024-02-28 09:40:06 +01:00
  • 3afc7797ab display function now executes every loop instead of 5 seconds sietse jonker 2024-02-28 09:24:16 +01:00
  • ddb21adc52 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 sietse jonker 2024-02-27 21:55:48 +01:00
  • b0731f739b adds last changes to code that clean it up sietse jonker 2024-02-27 21:55:47 +01:00
  • 982a275aa0 linux and rapsberry documentation bram Bram Barbieri 2024-02-27 20:45:42 +01:00
  • 3e82990c97 Merge branch 'main' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Bram Barbieri 2024-02-27 20:22:35 +01:00
  • 1b594b503a feedback and arduino video documentation bram Bram Barbieri 2024-02-27 20:22:33 +01:00
  • dcb2f37694 finishes up code for node sietse jonker 2024-02-27 19:46:52 +01:00
  • 5558289ba2 cleans up code and adds comments sietse jonker 2024-02-27 19:17:47 +01:00
  • dc3566f5e5 cleans up code and fixes counter sietse jonker 2024-02-27 19:06:27 +01:00
  • 63ad49675b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-02-27 16:55:51 +01:00
  • 984e5e748d Add update functionality and counter variables Sietse Jonker 2024-02-27 16:55:48 +01:00
  • 17588c38b3 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 sam 2024-02-27 16:12:55 +01:00
  • 3f60a08695 Added definition of done sam 2024-02-27 16:12:51 +01:00
  • 53af1d5858 Added screen scripts sam 2024-02-27 16:12:43 +01:00
  • 766d03282b Added library sam 2024-02-27 16:12:33 +01:00
  • 540d80a545 Add WiFi and WebSockets functionality to node code Sietse Jonker 2024-02-27 16:11:07 +01:00
  • a084960f0f Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 Sietse Jonker 2024-02-27 15:35:08 +01:00
  • 9adbde7e5c adds websocket code for esp32 Sietse Jonker 2024-02-27 15:35:07 +01:00
  • 79ec11a7a2 samenwerkings tijdlijn gepost Bram Barbieri 2024-02-27 13:43:06 +01:00
  • cf6aaa2f33 Samenwerkingscontract sam 2024-02-16 16:56:48 +01:00
  • 71981d193a Update navigation links and styling*** Dano van den Bosch 2024-02-16 13:15:38 +01:00
  • 9255b8ab97 Refactor HTML and JavaScript code, update graph data Dano van den Bosch 2024-02-16 12:28:41 +01:00