From 83e7c71c522f7d91fb8d416c77b807c72cf6ef08 Mon Sep 17 00:00:00 2001
From: Miriam Landa <miriam.landa@nibio.no>
Date: Mon, 6 Dec 2021 13:22:01 +0100
Subject: [PATCH] popup klar for testing
---
.../static/observations/js/observationList.js | 30 +++++--------------
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git a/observations/static/observations/js/observationList.js b/observations/static/observations/js/observationList.js
index afe7bc16..9d8d0df4 100644
--- a/observations/static/observations/js/observationList.js
+++ b/observations/static/observations/js/observationList.js
@@ -290,22 +290,17 @@ var renderObservationTable = function(data)
{
var obs = data[i];
var dSchema = JSON.parse(obs.observationDataSchema["dataSchema"])
- var dMod = JSON.parse(obs.observationDataSchema["dataModel"])
var obsData = JSON.parse(obs.observationData)
+
/**
* HashMap for values in the dataSchema
*/
var dSchemaVal = {}
- Object.keys(dSchema).forEach(function(key) {
- dSchemaVal[key] = dSchema[key]["title"]
- });
- /**
- * HashMap for default values
- */
- var defaultVal = {}
- Object.keys(dMod).forEach(function (key) {
- defaultVal[key] = dMod[key]
- })
+ Object.keys(dSchema['properties']).forEach(function(key) {
+
+ dSchemaVal[key] = dSchema['properties'][key]['title']
+ });
+
/**
* HashMap over measures values
*/
@@ -314,10 +309,6 @@ var renderObservationTable = function(data)
Object.keys(obsData).forEach(function (key) {
measuredVal[key] = obsData[key]
})
- // } else {
- // Object.keys(plain).forEach(function (key) {
- // faktiskVerdi[key] = "Denne er tom"
- // })
}
/**
* Create array that contains value for pop-up
@@ -327,11 +318,6 @@ var renderObservationTable = function(data)
Object.keys(dSchemaVal).forEach(function (key) {
if(Object.keys(measuredVal).length === 0){
return;
- // Object.keys(defaultVal).forEach(function (defaultKey) {
- // if(key == defaultKey){
- // printVal.push(dSchemaVal[key] + ": " + defaultVal[defaultKey])
- // }
- // })
} else {
Object.keys(measuredVal).forEach(function (defaultKey) {
if(key == defaultKey){
@@ -343,7 +329,6 @@ var renderObservationTable = function(data)
}
})
- console.info(printVal)
tbodyHTML.push("<tr>");
@@ -353,7 +338,8 @@ var renderObservationTable = function(data)
tbodyHTML.push("<td>" + obs.observationHeading + "</td>");
if(Object.keys(measuredVal).length != 0){
- tbodyHTML.push("<td><a tabindex='0' class='btn btn-lg' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>") + "' ><i class='fa fa-balance-scale' aria-hidden='true' </i></a></td>")} else{
+ tbodyHTML.push("<td><a tabindex='0' class='btn btn-lg' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>") + "' ><i class='fa fa-balance-scale' aria-hidden='true' </i></a></td>")
+ } else{
tbodyHTML.push("<td></td>")
}
--
GitLab