From 24aaf29bce5180a0097237e415897bbea3c8643a Mon Sep 17 00:00:00 2001 From: Bram Barbieri Date: Tue, 2 Apr 2024 17:05:55 +0200 Subject: [PATCH 1/3] beginning with getting data --- web/newWebsite/questions-main.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/web/newWebsite/questions-main.js b/web/newWebsite/questions-main.js index 06bf47e..8703471 100644 --- a/web/newWebsite/questions-main.js +++ b/web/newWebsite/questions-main.js @@ -1,5 +1,30 @@ //For now create dummy data to show on the website. -let dummydata1 = [40, 30, 20]; +let awa; + +data(); + + +async function data(){ +fetch("http://145.92.8.114/getQuestionData") +.then(response => { + if (!response.ok) { + throw new Error('Network response was not ok'); + } + return response.json(); +}) +.then(data => { + console.log(data); + let Q1Array = data.filter(item => item.Question_QuestionID == 1); + console.log(Q1Array); + let R1Array = Q1Array.filter(item => item.Result == 0); + awa = R1Array.length; + graph() +}) + +} +// for each(Result == 0) in +async function graph() { +let dummydata1 = [awa, 3, 5]; let questionOptionsDummy1 = ['disgusting','clean', 'fine']; let dummydata2 = [25, 35, 40]; @@ -52,3 +77,4 @@ const myChart4 = new Chart(ctx4, chartConfigArray[3].chartConfig); const ctx5 = document.getElementById('chart5').getContext('2d'); const myChart5 = new Chart(ctx5, chartConfigArray[4].chartConfig); +} \ No newline at end of file From 70c95e676ec47181227706d7d1e5ee6f4b88ee11 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Tue, 2 Apr 2024 17:10:26 +0200 Subject: [PATCH 2/3] for each loop for data graphs --- web/newWebsite/questions-main.js | 56 +++++++++++++++++++------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/web/newWebsite/questions-main.js b/web/newWebsite/questions-main.js index 8703471..4326b92 100644 --- a/web/newWebsite/questions-main.js +++ b/web/newWebsite/questions-main.js @@ -4,39 +4,51 @@ let awa; data(); -async function data(){ -fetch("http://145.92.8.114/getQuestionData") -.then(response => { - if (!response.ok) { - throw new Error('Network response was not ok'); - } - return response.json(); -}) -.then(data => { - console.log(data); - let Q1Array = data.filter(item => item.Question_QuestionID == 1); - console.log(Q1Array); - let R1Array = Q1Array.filter(item => item.Result == 0); - awa = R1Array.length; - graph() -}) +async function data() { + fetch("http://145.92.8.114/getQuestionData") + .then(response => { + if (!response.ok) { + throw new Error('Network response was not ok'); + } + return response.json(); + }) + .then(data => { + console.log(data); -} + // Initialize an array to hold the counts for each question + let questionCounts = [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]]; + + // Iterate over the data + for (let item of data) { + // Increment the count for the appropriate question and result + questionCounts[item.Question_QuestionID - 1][item.Result]++; + } + + // Log the counts for each question + for (let i = 0; i < questionCounts.length; i++) { + console.log(`Question ${i + 1} counts: ${questionCounts[i]}`); + } + + // Update the dummydata arrays + dummydata1 = questionCounts[0]; + dummydata2 = questionCounts[1]; + dummydata3 = questionCounts[2]; + dummydata4 = questionCounts[3]; + dummydata5 = questionCounts[4]; + + graph(); + }) +} // for each(Result == 0) in async function graph() { -let dummydata1 = [awa, 3, 5]; let questionOptionsDummy1 = ['disgusting','clean', 'fine']; -let dummydata2 = [25, 35, 40]; let questionOptionsDummy2 = ['disgusting', 'clean', 'normal']; -let dummydata3 = [30, 20, 20]; let questionOptionsDummy3 = ['cold', 'perfect', 'hot']; -let dummydata4 = [30, 20, 20]; let questionOptionsDummy4 = ['really crowded','not at all', 'its fine', ]; -let dummydata5 = [30, 20, 20]; let questionOptionsDummy5 = ['no','yes', 'decently']; //make arrays to store data. From 46f9ca12927276d0f59e3a14738759bcc20e07f2 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Tue, 2 Apr 2024 17:10:33 +0200 Subject: [PATCH 3/3] removed thingy --- docs/brainstorm/UML-infrastrucuteV2.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/brainstorm/UML-infrastrucuteV2.md b/docs/brainstorm/UML-infrastrucuteV2.md index 059a1e5..87ea245 100644 --- a/docs/brainstorm/UML-infrastrucuteV2.md +++ b/docs/brainstorm/UML-infrastrucuteV2.md @@ -15,7 +15,6 @@ namespace ESP32Questionbox { +int questionID +char*[] Question +char*[] Answer - +Adafruit_ST7796S_kbv tft +DisplayText displayText +void websocketSetup() }