From 2c39cc90ade4eafb6f3e18d1c47d537a8eaf78a8 Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Wed, 3 Apr 2024 11:41:05 +0200 Subject: [PATCH 1/6] Add flex display to #editNode --- web/newWebsite/styles/dashboard-styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/newWebsite/styles/dashboard-styles.css b/web/newWebsite/styles/dashboard-styles.css index 6c1a36c..a8b37b5 100644 --- a/web/newWebsite/styles/dashboard-styles.css +++ b/web/newWebsite/styles/dashboard-styles.css @@ -19,6 +19,7 @@ } #editNode { + display: flex; margin-top: 1%; width: 98vw; height: 20vh; From 3c87feec7640fcd0396cf1dd0f842119d085c777 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 3 Apr 2024 11:41:49 +0200 Subject: [PATCH 2/6] docs --- docs/.pages | 2 +- docs/brainstorm/UML-infrastrucuteV2.md | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/.pages b/docs/.pages index 0e931bc..3405589 100644 --- a/docs/.pages +++ b/docs/.pages @@ -28,7 +28,7 @@ nav: - Infrastructure: brainstorm/UML-infrastructure - Taskflow: brainstorm/Taskflow - Design: Sp1SchetsProject/FirstDesign - - Interview facility manager: brainstorm/bebouwBeheer.md + - Interview facility manager: brainstorm/gebouwBeheer - 🖨️ Software: - Dev page: brainstorm/SoftwareDocumentatie/Dev_page \ No newline at end of file diff --git a/docs/brainstorm/UML-infrastrucuteV2.md b/docs/brainstorm/UML-infrastrucuteV2.md index 87ea245..4af0435 100644 --- a/docs/brainstorm/UML-infrastrucuteV2.md +++ b/docs/brainstorm/UML-infrastrucuteV2.md @@ -4,10 +4,10 @@ classDiagram loop --> screenButtonHandler screenButtonHandler --> DisplayText screenButtonHandler --> sendData - sendData --> Server + sendData --> Server : Websocket setup --> loop python --> Server - Server --> website + Server --> website : Websocket namespace ESP32Questionbox { @@ -25,6 +25,12 @@ namespace ESP32Questionbox { +void hexdump(const void* mem, uint32_t len, uint8_t cols) } + class websocketClient { + +loop() + +begin() + +sendTXT() + } + class websocketSetup { +connectWifi() +websocketConnect() From 654f797d9ddd4cdb47d08dcf96e2fbf1d8cdb1a9 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 3 Apr 2024 11:41:56 +0200 Subject: [PATCH 3/6] fixed datatypes --- web/newWebsite/questions-main.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/newWebsite/questions-main.js b/web/newWebsite/questions-main.js index 4326b92..f526dd5 100644 --- a/web/newWebsite/questions-main.js +++ b/web/newWebsite/questions-main.js @@ -41,15 +41,15 @@ async function data() { } // for each(Result == 0) in async function graph() { -let questionOptionsDummy1 = ['disgusting','clean', 'fine']; +let questionOptionsDummy1 = ['clean','fine', 'disgusting']; -let questionOptionsDummy2 = ['disgusting', 'clean', 'normal']; +let questionOptionsDummy2 = ['clean', 'normal', 'disgusting']; -let questionOptionsDummy3 = ['cold', 'perfect', 'hot']; +let questionOptionsDummy3 = ['hot', 'perfect', 'cold']; -let questionOptionsDummy4 = ['really crowded','not at all', 'its fine', ]; +let questionOptionsDummy4 = ['not at all', 'its fine', 'really crowded', ]; -let questionOptionsDummy5 = ['no','yes', 'decently']; +let questionOptionsDummy5 = ['no','decently', 'yes']; //make arrays to store data. let chartConfigArray = []; From c8ab03c0cdb83b76c643c48a4363137ef0e1fad7 Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Wed, 3 Apr 2024 11:46:10 +0200 Subject: [PATCH 4/6] Update brainstorm documentation with new questions --- docs/.pages | 5 ++++- .../brainstorm/{Questions Enquete.md => QuestionsEnquete.md} | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename docs/brainstorm/{Questions Enquete.md => QuestionsEnquete.md} (100%) diff --git a/docs/.pages b/docs/.pages index 3405589..b1b49e0 100644 --- a/docs/.pages +++ b/docs/.pages @@ -20,15 +20,18 @@ nav: - Websockets: rpi-documentation/websockets - Reverse Proxy: rpi-documentation/Reverse-Proxy - Db - Ws connection: rpi-documentation/Databaseconnection + - Put-request: rpi-documentation/Put-Request - 🧠 Brainstorm: - Ideeën: brainstorm/ideeën - Database design: brainstorm/Database - Feedback: brainstorm/Feedback - Problem: brainstorm/Problem - - Infrastructure: brainstorm/UML-infrastructure + - Infrastructure: brainstorm/UML-infrastructureV2 - Taskflow: brainstorm/Taskflow - Design: Sp1SchetsProject/FirstDesign - Interview facility manager: brainstorm/gebouwBeheer + - Questions enquete: brainstorm/QuestionsEnquete - 🖨️ Software: - Dev page: brainstorm/SoftwareDocumentatie/Dev_page + - Graph classes: brainstorm/SoftwareDocumentatie/classes \ No newline at end of file diff --git a/docs/brainstorm/Questions Enquete.md b/docs/brainstorm/QuestionsEnquete.md similarity index 100% rename from docs/brainstorm/Questions Enquete.md rename to docs/brainstorm/QuestionsEnquete.md From 3a825744e7244b56930c7be79c96e46d5b112386 Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Wed, 3 Apr 2024 11:50:14 +0200 Subject: [PATCH 5/6] Update image paths in node documentation --- docs/node-documentation/node.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/node-documentation/node.md b/docs/node-documentation/node.md index 369c8ef..2ab42da 100644 --- a/docs/node-documentation/node.md +++ b/docs/node-documentation/node.md @@ -64,14 +64,12 @@ flowchart LR The wiring diagram for the node is as follows: -![Wiring diagram of node](docs\assets\imagesSp3\wiringDiagramNode.png) +![Wiring diagram of node](..\assets\imagesSp3\wiringDiagramNode.png) ### Fritsing Diagram -![fritsing diagram of node](docs\assets\Node.fzz) - -![fritsing diagram of node](.\assets\Node.png) +![fritsing diagram of node](..\assets\Node.png) ## Future Improvements From e43be1c6b14e9407d696a78baf28dbcc8b4b1ade Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Wed, 3 Apr 2024 11:51:48 +0200 Subject: [PATCH 6/6] Add UML infrastructure diagram --- .../{UML-infrastrucuteV2.md => UML-infrastructureV2.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/brainstorm/{UML-infrastrucuteV2.md => UML-infrastructureV2.md} (100%) diff --git a/docs/brainstorm/UML-infrastrucuteV2.md b/docs/brainstorm/UML-infrastructureV2.md similarity index 100% rename from docs/brainstorm/UML-infrastrucuteV2.md rename to docs/brainstorm/UML-infrastructureV2.md