Smikkelbakje/J1B3-Sensor-boxes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bram Barbieri
2024-04-01 13:19:27 +02:00
parent 38722052f3 59377aa2b5
commit ab8249702e
10 changed files with 126 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
arduino/Screen code/Screen-code-full/Screen-code.ino Normal file
View File

0
arduino/Screen code/Adafruit_ST7796S_kbv-master.zip → arduino/Screen code/screen-code-class/Adafruit_ST7796S_kbv-master.zip
View File

0
arduino/Screen code/Screen-code-full/displayText.cpp → arduino/Screen code/screen-code-class/displayText.cpp
View File

0
arduino/Screen code/Screen-code-full/displayText.h → arduino/Screen code/screen-code-class/displayText.h
View File

0
arduino/Screen code/Screen-code-full/Screen-code-full.ino → arduino/Screen code/screen-code-class/example.ino
View File

0
arduino/Screen code/Screen-code-full/headerFile.h → arduino/Screen code/screen-code-class/headerFile.h
View File

22
web/newWebsite/graph-classes.js
View File

@@ -52,10 +52,10 @@ class Graph {
this.humiArray.push(value); this.humiArray.push(value);
break; break;
case "eCO2": case "eCO2":
this.eco2Array.push(value); this.eco2Array.push(value / 10);
break; break;
case "TVOC": case "TVOC":
this.tvocArray.push(value); this.tvocArray.push(value / 10);
break; break;
default: default:
console.error("Invalid type"); console.error("Invalid type");
@@ -64,16 +64,11 @@ class Graph {
updateGraph() { updateGraph() {
let update = { let update = {
x: [[this.timeArray]], x: [this.timeArray],
y: [ y: [this.tempArray, this.humiArray, this.eco2Array, this.tvocArray],
[this.tempArray],
[this.humiArray],
[this.eco2Array],
[this.tvocArray],
],
}; };
Plotly.relayout(this.id, update); Plotly.update(this.id, update);
} }
} }
@@ -126,11 +121,12 @@ class LiveGraph extends Graph {
class DataProcessor { class DataProcessor {
constructor(data) { constructor(data) {
this.data = data; this.data = data;
this.graph;
} }
// You can add more filtering methods based on different criteria if needed // You can add more filtering methods based on different criteria if needed
update(data) { update(data) {
this.data = data; this.data = data;
this.graph;
console.log("Data updated"); console.log("Data updated");
console.log(data); console.log(data);
} }
@@ -144,10 +140,12 @@ class DataProcessor {
} }
updateGraph() { updateGraph() {
for (let i = 0; i < this.data.length; i++) { for (let i = 0; i < this.data.length; i + 3) {
for (let i = 0; i < 4; i++) {
this.graph.updateData(this.data[i].Type, this.data[i].Value, this.data[i].TimeStamp); this.graph.updateData(this.data[i].Type, this.data[i].Value, this.data[i].TimeStamp);
console.log(this.data[i].Type, this.data[i].Value, this.data[i].TimeStamp); console.log(this.data[i].Type, this.data[i].Value, this.data[i].TimeStamp);
this.graph.updateGraph(); this.graph.updateGraph();
} }
} }
}
} }

132
web/newWebsite/graph-main.js
View File

@@ -1,6 +1,7 @@
// Sample data - you can replace this with your actual dataset // Sample data - you can replace this with your actual dataset
const data = []; const data = [];
processor = new DataProcessor(); processor = new DataProcessor();
let link;
// Function to create checkbox with label // Function to create checkbox with label
function createCheckBox(id, label) { function createCheckBox(id, label) {
@@ -16,36 +17,34 @@ function createCheckBox(id, label) {
return { checkbox, checkboxLabel }; return { checkbox, checkboxLabel };
} }
// Function to ceate filter container and all the input elements // Create HTML input elements for user input
function createFilterContainer() { const container = document.createElement("div");
// Create HTML input elements for user input container.setAttribute("class", "container");
const container = document.createElement("div");
container.setAttribute("class", "container");
const dataTypesContainer = document.createElement("div"); const dataTypesContainer = document.createElement("div");
dataTypesContainer.setAttribute("class", "data-types"); dataTypesContainer.setAttribute("class", "data-types");
const temperatureCheckbox = createCheckBox("temperature", "Temperature"); const temperatureCheckbox = createCheckBox("temperature", "Temperature");
const humidityCheckbox = createCheckBox("humidity", "Humidity"); const humidityCheckbox = createCheckBox("humidity", "Humidity");
const eco2Checkbox = createCheckBox("eco2", "eCO2"); const eco2Checkbox = createCheckBox("eco2", "eCO2");
const tvocCheckbox = createCheckBox("tvoc", "TVOC"); const tvocCheckbox = createCheckBox("tvoc", "TVOC");
dataTypesContainer.appendChild(temperatureCheckbox.checkbox); dataTypesContainer.appendChild(temperatureCheckbox.checkbox);
dataTypesContainer.appendChild(temperatureCheckbox.checkboxLabel); dataTypesContainer.appendChild(temperatureCheckbox.checkboxLabel);
dataTypesContainer.appendChild(humidityCheckbox.checkbox); dataTypesContainer.appendChild(humidityCheckbox.checkbox);
dataTypesContainer.appendChild(humidityCheckbox.checkboxLabel); dataTypesContainer.appendChild(humidityCheckbox.checkboxLabel);
dataTypesContainer.appendChild(eco2Checkbox.checkbox); dataTypesContainer.appendChild(eco2Checkbox.checkbox);
dataTypesContainer.appendChild(eco2Checkbox.checkboxLabel); dataTypesContainer.appendChild(eco2Checkbox.checkboxLabel);
dataTypesContainer.appendChild(tvocCheckbox.checkbox); dataTypesContainer.appendChild(tvocCheckbox.checkbox);
dataTypesContainer.appendChild(tvocCheckbox.checkboxLabel); dataTypesContainer.appendChild(tvocCheckbox.checkboxLabel);
container.appendChild(dataTypesContainer); container.appendChild(dataTypesContainer);
const filterButton = document.createElement("button"); const filterButton = document.createElement("button");
filterButton.textContent = "Filter Data"; filterButton.textContent = "Filter Data";
filterButton.setAttribute("class", "filter-button"); filterButton.setAttribute("class", "filter-button");
filterButton.addEventListener("click", () => { filterButton.addEventListener("click", () => {
const startDate = new Date(document.getElementById("start-date").value); const startDate = document.getElementById("start-date").value
const endDate = new Date(document.getElementById("end-date").value); const endDate = document.getElementById("end-date").value
const selectedNodes = document const selectedNodes = document
.getElementById("node-input") .getElementById("node-input")
.value.split(",") .value.split(",")
@@ -64,58 +63,65 @@ function createFilterContainer() {
} }
}); });
const filteredData = filterData( const filteredData = [
data,
startDate, startDate,
endDate, endDate,
selectedNodes, selectedNodes,
selectedFields selectedFields
); ];
console.log(filteredData); console.log(filteredData);
}); console.log(startDate, endDate, selectedNodes);
const dateFilter = document.createElement("div"); generateLink(startDate, endDate, selectedNodes);
dateFilter.setAttribute("class", "date-filter"); fetchData();
});
const startDateInput = document.createElement("input"); const dateFilter = document.createElement("div");
startDateInput.setAttribute("type", "datetime-local"); dateFilter.setAttribute("class", "date-filter");
startDateInput.setAttribute("id", "start-date");
startDateInput.setAttribute("class", "input-field");
const endDateInput = document.createElement("input"); const startDateInput = document.createElement("input");
endDateInput.setAttribute("type", "datetime-local"); startDateInput.setAttribute("type", "datetime-local");
endDateInput.setAttribute("id", "end-date"); startDateInput.setAttribute("id", "start-date");
endDateInput.setAttribute("class", "input-field"); startDateInput.setAttribute("class", "input-field");
dateFilter.appendChild(startDateInput); const endDateInput = document.createElement("input");
dateFilter.appendChild(endDateInput); endDateInput.setAttribute("type", "datetime-local");
container.appendChild(dateFilter); endDateInput.setAttribute("id", "end-date");
endDateInput.setAttribute("class", "input-field");
const nodeFilter = document.createElement("div"); dateFilter.appendChild(startDateInput);
nodeFilter.setAttribute("class", "node-filter"); dateFilter.appendChild(endDateInput);
container.appendChild(dateFilter);
const nodeInput = document.createElement("input"); const nodeFilter = document.createElement("div");
nodeInput.setAttribute("type", "text"); nodeFilter.setAttribute("class", "node-filter");
nodeInput.setAttribute("placeholder", "Enter node (A, B, etc.)");
nodeInput.setAttribute("id", "node-input");
nodeInput.setAttribute("class", "input-field");
nodeFilter.appendChild(nodeInput); const nodeInput = document.createElement("input");
container.appendChild(nodeFilter); nodeInput.setAttribute("type", "text");
nodeInput.setAttribute("placeholder", "Enter node (A, B, etc.)");
nodeInput.setAttribute("id", "node-input");
nodeInput.setAttribute("class", "input-field");
container.appendChild(filterButton); nodeFilter.appendChild(nodeInput);
container.appendChild(nodeFilter);
document.body.appendChild(container); container.appendChild(filterButton);
}
document.body.appendChild(container);
// Function to get the link for the get request // Function to get the link for the get request
function getLink(startDate, endDate, node) { function generateLink(dateStart, dateEnd, node) {
return link = "http://getMeasurements?dateStart=" + startDate.toISOString() + const baseUrl = 'http://145.92.8.114/getMeasurements';
"&dateEnd=" + endDate.toISOString() + const formattedDateStart = new Date(dateStart).toISOString().replace('T', '%20');
"&node=" + node; const formattedDateEnd = new Date(dateEnd).toISOString().replace('T', '%20');
link = `${baseUrl}?dateStart=${formattedDateStart}&dateEnd=${formattedDateEnd}&node=${node}`;
console.log(link);
} }
processor.makeGraph();
// Get request to fetch data from the server // Get request to fetch data from the server
function fetchData(link) { function fetchData() {
fetch(link) fetch(link)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
@@ -124,14 +130,10 @@ function fetchData(link) {
return response.json(); return response.json();
}) })
.then((data) => { .then((data) => {
createFilterContainer();
processor.update(data); processor.update(data);
processor.makeGraph(); processor.updateGraph();
processor.updateGraph(dateStart, dateEnd);
}) })
.catch((error) => { .catch((error) => {
console.error("Error fetching data:", error); console.error("Error fetching data:", error);
}); });
} }
fetchData();

27
web/newWebsite/questions-main.js
View File

@@ -13,15 +13,22 @@ let questionOptionsDummy4 = ['really crowded','not at all', 'its fine', ];
let dummydata5 = [30, 20, 20]; let dummydata5 = [30, 20, 20];
let questionOptionsDummy5 = ['no','yes', 'decently']; let questionOptionsDummy5 = ['no','yes', 'decently'];
const question1Data = new QuestionCreationClass(dummydata1,questionOptionsDummy1)
const question2Data = new QuestionCreationClass(dummydata2,questionOptionsDummy2) let questionArray = [];
const question3Data = new QuestionCreationClass(dummydata3, questionOptionsDummy3); let questionOptionsDummy = [];
const question4Data = new QuestionCreationClass(dummydata4, questionOptionsDummy4); let dummydata = [];
const question5Data = new QuestionCreationClass(dummydata5, questionOptionsDummy5);
for (let i = 0; i < 5; i++) {
dummydata.push(dummydata1, dummydata2, dummydata3, dummydata4, dummydata5);
questionOptionsDummy.push(questionOptionsDummy1, questionOptionsDummy2, questionOptionsDummy3, questionOptionsDummy4, questionOptionsDummy5);
questionArray.push(new QuestionCreationClass(dummydata[i], questionOptionsDummy[i]));
}
const chartConfig1 = { const chartConfig1 = {
type: 'pie', type: 'pie',
data: question1Data.questionData, data: questionArray[0].questionData,
options: { options: {
responsive: true, responsive: true,
legend: { legend: {
@@ -40,7 +47,7 @@ const chartConfig1 = {
const chartConfig2 = { const chartConfig2 = {
type: 'pie', type: 'pie',
data: question2Data.questionData, data: questionArray[1].questionData,
options: { options: {
responsive: true, responsive: true,
legend: { legend: {
@@ -59,7 +66,7 @@ const chartConfig2 = {
const chartConfig3 = { const chartConfig3 = {
type: 'pie', type: 'pie',
data: question3Data.questionData, data: questionArray[2].questionData,
options: { options: {
responsive: true, responsive: true,
legend: { legend: {
@@ -78,7 +85,7 @@ const chartConfig3 = {
const chartConfig4 = { const chartConfig4 = {
type: 'pie', type: 'pie',
data: question4Data.questionData, data: questionArray[3].questionData,
options: { options: {
responsive: true, responsive: true,
legend: { legend: {
@@ -97,7 +104,7 @@ const chartConfig4 = {
const chartConfig5 = { const chartConfig5 = {
type: 'pie', type: 'pie',
data: question5Data.questionData, data: questionArray[4].questionData,
options: { options: {
responsive: true, responsive: true,
legend: { legend: {

12
web/newWebsite/styles/dashboard-styles.css
View File

@@ -182,17 +182,19 @@ body {
} }
.plotly-container { .plotly-container {
width: 100%;
float: bottom; float: bottom;
margin: auto;
padding: 1vw; padding: 1vw;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
display: flex; display: flex;
width: 20vw;
} }
*
.js-plotly-plot {
width: 90%;
height: 100%;
}
.disabled { .disabled {
opacity: 0; opacity: 0;
height: 0; height: 0;