Merge branch 'main' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59

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/bebouwBeheer.md
+        - Interview facility manager: brainstorm/gebouwBeheer
+        - Questions enquete: brainstorm/QuestionsEnquete
     - 🖨️ Software:
         - Dev page: brainstorm/SoftwareDocumentatie/Dev_page
+        - Graph classes: brainstorm/SoftwareDocumentatie/classes
         

docs/brainstorm/UML-infrastructureV2.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()

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
 

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 = [];

web/newWebsite/styles/dashboard-styles.css

@@ -19,6 +19,7 @@
 }
 
 #editNode {
+  display: flex;
   margin-top: 1%;
   width: 98vw;
   height: 20vh;