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() } diff --git a/web/newWebsite/questions-main.js b/web/newWebsite/questions-main.js index 06bf47e..4326b92 100644 --- a/web/newWebsite/questions-main.js +++ b/web/newWebsite/questions-main.js @@ -1,17 +1,54 @@ //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); + + // 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 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. @@ -52,3 +89,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