Dano van den Bosch
67aaaca588
Merge branch '43-als-gebruiker-wil-ik-een-grafiek-hebben-met-live-data-zodat-de-dat-van-de-laatste-paar-minuten' into 'main'
...
Resolve "Als gebruiker wil ik een grafiek hebben met live data, zodat de dat van de laatste paar minuten live kan terugzien en veranderingen beter zie"
Closes #43
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59!5
2024-03-07 14:26:19 +01:00
Dano van den Bosch
54f52bce48
path updated for page
2024-03-07 14:22:30 +01:00
Sietse Jonker
083858f9cf
Merge branch 'Website_websocket' into 'main'
...
Website websocket
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59!4
2024-03-07 14:20:52 +01:00
sietse jonker
866af9253e
Add graph documentation
2024-03-07 14:20:21 +01:00
Dano van den Bosch
185a972f1b
dev page documentation
2024-03-07 14:01:20 +01:00
Bram Barbieri
fb304af3a4
Merge branch 'main' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
2024-03-07 13:59:03 +01:00
Bram Barbieri
c7ee23afd7
Bram docs, daily standups
2024-03-07 13:59:01 +01:00
sietse jonker
598dd54521
Add new lines for temperature, humidity, eCO2, and TVOC in liveGraph class
2024-03-07 13:18:12 +01:00
Dano van den Bosch
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
2024-03-07 13:11:03 +01:00
Dano van den Bosch
878fb9f491
Refactor JSON parsing and data handling functions
2024-03-07 13:11:01 +01:00
sietse jonker
1472c17125
Fix variable name and update amount of nodes
2024-03-07 13:09:28 +01:00
Sam
d1c962f71c
added so the answer text is at the bottom
2024-03-07 13:04:14 +01:00
Sam
f2964ebce8
added new function to have text automaticly at the bottom
2024-03-07 13:03:58 +01:00
sietse jonker
0b8ae0ef34
Refactor main.js: Add descriptions, declare variables, and update loop condition
2024-03-07 13:03:28 +01:00
sietse jonker
bc8cc500cb
Refactor code to dynamically create node data and live graphs
2024-03-07 13:00:22 +01:00
sietse jonker
2e394f3d45
Update liveGraphs to include temperature, humidity, eCO2, and TVOC data
2024-03-07 12:57:54 +01:00
sietse jonker
6070ba7480
edits css
2024-03-07 11:22:25 +01:00
sietse jonker
656cd83aee
Refactor CSS styles and remove unnecessary code
2024-03-06 21:27:19 +01:00
sietse jonker
bd66f21082
Update interval delay and refactor liveGraph creation
2024-03-06 21:16:30 +01:00
Sietse Jonker
36277a7e5d
Update file index.html
2024-03-06 20:56:19 +01:00
sietse jonker
2c0b7df0a1
Refactor HTML structure in index.html
2024-03-06 20:55:43 +01:00
Sietse Jonker
55f94387cc
Merge branch 'Website_websocket' into 'main'
...
Website websocket to main
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59!3
2024-03-06 20:36:11 +01:00
Sietse Jonker
24164841a9
Merge branch 'main' into 'Website_websocket'
...
# Conflicts:
# arduino/node-code/node-code-final/node-code-final.ino
# web/classes.js
# web/index.html
# web/main.js
# web/styles.css
2024-03-06 20:35:56 +01:00
Sietse Jonker
c14c18deb0
Remove commented out code and update graph in main.js
2024-03-06 17:38:09 +01:00
sam
f4840775ed
Added uml
2024-03-06 16:05:31 +01:00
Sietse Jonker
63be84e287
Update graph colors and scale for temperature, eCO2, and TVOC
2024-03-06 15:59:54 +01:00
Sietse Jonker
199283d3e0
Add live graph plots for humidity, eCO2, and TVOC
2024-03-06 15:51:01 +01:00
sam
27742cfa89
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
2024-03-06 15:46:42 +01:00
sam
5a8e13c0d6
Added class
2024-03-06 15:46:39 +01:00
sam
284071b4ee
Class creation
2024-03-06 15:46:32 +01:00
Sietse Jonker
8ed556d856
Refactor liveGraph class and updateNodeData function
2024-03-06 15:38:46 +01:00
Sietse Jonker
951fc64e6d
adds graph class
2024-03-06 15:03:47 +01:00
Sietse Jonker
65783ac3b6
Add liveGraph class and update index.html
2024-03-06 15:02:34 +01:00
Sietse Jonker
9b01523f0e
makes class for graphs
2024-03-06 15:01:20 +01:00
Dano van den Bosch
b971fe0b54
dev page documentation added to pages
2024-03-06 11:25:58 +01:00
Sietse Jonker
a2219fa03a
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
2024-03-05 16:37:02 +01:00
Sietse Jonker
67d77d59d1
changes html and css for testing class
2024-03-05 16:36:58 +01:00
Sietse Jonker
db9c984446
adds class for graph
2024-03-05 16:36:42 +01:00
Dano van den Bosch
026bd92d65
I did it 😊
2024-03-05 16:03:15 +01:00
sam
698b3055a4
File creation + text centre + split array
2024-03-05 16:02:34 +01:00
sam
2b31f80655
File creation
2024-03-05 16:02:17 +01:00
sam
d3952306b2
Added reset
2024-03-05 16:02:12 +01:00
Dano van den Bosch
de1ae975a4
added code for muliple nodes
2024-03-05 14:46:43 +01:00
sam
f99d7b5c3d
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
2024-03-05 14:22:43 +01:00
sam
21ef8604c2
changed asset
2024-03-05 14:22:40 +01:00
sam
e09651a90c
Added asset
2024-03-05 14:22:06 +01:00
sam
0886352a1c
added script
2024-03-05 14:21:57 +01:00
sam
307257eefc
Added writetext function
2024-03-05 14:21:47 +01:00
sam
fba7ada367
Simple button script
2024-03-05 14:21:35 +01:00
Sietse Jonker
1596f0c641
Fix grammatical error from dano
2024-03-05 14:10:52 +01:00
