jaume
/
infravis-trahust
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seva/Load Boards ->first version beta ready!

Browse Source
Rafael
jaume-nualart 7 months ago
parent 2ed161e2ce
commit ac035038f2
3 changed files with 12 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      py/Boards/Charlie/test2.json
  2. 1
      py/Boards/Charlie/test3.json
  3. 16
      web-html/js/dash.js

1
py/Boards/Charlie/test2.json
Unescape View File

@ -0,0 +1 @@
{"Name": "test2", "Description": "this is exactly like test1", "Hus": "Charlie", "col-left": [{"order": 0, "id": "P-txt-723017", "text": "eeeeeeeeeeeeeeee", "api_url": null}, {"order": 1, "id": "parallel-4286811", "text": "", "api_url": "parallel/daily?hus=Charlie&family=MP1_1&type=celsius&day=2022-12-15"}], "col-center": [{"order": 0, "id": "G-txt-910177", "text": "err weerr we", "api_url": null}, {"order": 1, "id": "grid-438525", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}], "col-right": [{"order": 0, "id": "H-txt-974001", "text": "rerer er rererer er re", "api_url": null}, {"order": 1, "id": "horizon-487744", "text": "", "api_url": "horizon/daily?hus=Charlie&family=MP1_1&type=celsius&day=2023-02-07"}]}

1
py/Boards/Charlie/test3.json
Unescape View File

@ -0,0 +1 @@
{"Name": "test3", "Description": "test2 has TXT+Diagram -> 1+2, 1+2 and 1+2", "Hus": "Charlie", "col-left": [{"order": 0, "id": "P-txt-723017", "text": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", "api_url": null}, {"order": 1, "id": "parallel-4286811", "text": "", "api_url": "parallel/daily?hus=Charlie&family=MP1_1&type=celsius&day=2022-12-15"}, {"order": 2, "id": "parallel-8519775", "text": "", "api_url": "parallel/yearly?hus=Charlie&family=MP1_1&type=celsius&year=2023"}], "col-center": [{"order": 0, "id": "G-txt-910177", "text": "err weerr weerr weerr we", "api_url": null}, {"order": 1, "id": "grid-438525", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}, {"order": 2, "id": "grid-628976", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01"}], "col-right": [{"order": 0, "id": "H-txt-974001", "text": "rerer er rererer er rererer er rererer er re", "api_url": null}, {"order": 1, "id": "horizon-487744", "text": "", "api_url": "horizon/daily?hus=Charlie&family=MP1_1&type=celsius&day=2023-02-07"}, {"order": 2, "id": "horizon-138015", "text": "", "api_url": "horizon/weekly?hus=Charlie&family=MP1_1&type=celsius&year=2023&week=14"}]}

16
web-html/js/dash.js
Unescape View File

@ -1900,6 +1900,7 @@ async function loadBoards(myJSON) {
if (col.length > 0) {
myJSON[col].forEach(async element => {
// Get necessary variables:
var myTitle = myTitle ? nuull : "";
var myColumn = col;
var myid = element.id;
var myTitle = element.text;
@ -1930,7 +1931,7 @@ async function loadBoards(myJSON) {
var day = getValueByKeyFrrmUrl("day", apiurl);
cl("PD LoadBoards:");
cl(formId+" - "+apiurl+" - "+myid+" - "+myTitle+" - "+family+" - "+type+" - "+day);
makeApiRequest(formId, apiurl, myid. myTitle, family, type, day);
makeApiRequest(formId, apiurl, myid, myTitle, family, type, day);
break;
case "GW":
@ -1938,14 +1939,14 @@ async function loadBoards(myJSON) {
// Trans for week and year to DD-MM-YYYY
var startingDate = getFormattedDateFromWeek(week, year);
cl("startingDate: "+startingDate+" -formId - "+formId+" -apiurl: "+apiurl+" -myid: "+myid+" -myTitle: "+myTitle+" -semsor: "+sensor+" -type: "+type+" -week: "+week+" -year: "+year);
makeApiRequest(formId, apiurl, myid. myTitle, sensor, type, startingDate);
makeApiRequest(formId, apiurl, myid, myTitle, sensor, type, startingDate);
break;
case "GM":
var month = getValueByKeyFrrmUrl("month", apiurl);
makeApiRequest(formId, apiurl, myid. myTitle, sensor, type, year, month);
makeApiRequest(formId, apiurl, myid, myTitle, sensor, type, year, month);
break;
case "GY":
makeApiRequest(formId, apiurl, myid. myTitle, sensor, type, year);;
makeApiRequest(formId, apiurl, myid, myTitle, sensor, type, year);;
break;
@ -1976,7 +1977,7 @@ function fetchDataAndGenerateHTML(husName) {
const generatedHTML = generateHTML(jsonData);
// cl("List Boards HTML:");
// console.log(generatedHTML);
document.getElementById("loadBoard-pills-default").insertAdjacentHTML('beforeend', generatedHTML);
document.getElementById("loadBoard-pills-default").innerHTML = generatedHTML;
})
.catch(error => {
console.error("Error:", error);
@ -2073,6 +2074,9 @@ function makeApiRequest(formId, apiUrl, myid, myTitle, ...args) {
var sensor = myArgs[0];
var type = myArgs[1];
var inDate = myArgs[2];
cl("startingDate: "+startingDate+" -formId - "+formId+" -apiurl: "+apiurl+" -myid: "+myid+" -myTitle: "+myTitle+" -semsor: "+sensor+" -type: "+type+" -inDate: ");
cl(myArgs);
break;
case "GM":
var sensor = myArgs[0];
@ -2113,7 +2117,7 @@ function makeApiRequest(formId, apiUrl, myid, myTitle, ...args) {
var year = myArgs[2];
break;
}
}
// Make an AJAX request to your Flask API
var apiRequest = `http://localhost:5000/${apiUrl}`; ///parallel/daily?family=${family}&type=${type}&day=${day}`;

Write Preview
Loading…
Cancel
Save