Update Entity display to Normalised/Simplified

Author: jason-fox

app/app.js

@@ -51,6 +51,8 @@ app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(flash());
 
+console.log(sessionOff)
+
 if (process.env.NODE_ENV === 'production' && !sessionOff) {
     // Use Mongo-DB to store session data.
     app.use(

app/controllers/ngsi-ld/animal.js

@@ -15,7 +15,7 @@ async function getAnimals(req, res) {
     const animals = await ngsiLD.listEntities(
         {
             type: 'Animal',
-            options: 'concise',
+            format: 'normalized',
             limit: ENTITY_LIMIT
         },
         headers
@@ -51,7 +51,7 @@ async function displayAnimal(req, res) {
         monitor('NGSI', 'readEntity ' + req.params.id);
         const animal = await ngsiLD.readEntity(
             req.params.id,
-            { options: 'concise' },
+            { format: 'normalized' },
             ngsiLD.setHeaders(req.session.access_token, LinkHeader)
         );
 
@@ -60,7 +60,7 @@ async function displayAnimal(req, res) {
         if (imgId < 100) {
             imgId = `00${imgId % 10}`;
         }
-        return res.render('animal', { title: animal.name, animal, imgId });
+        return res.render('animal', { title: animal.name.value, animal, imgId });
     } catch (error) {
         // If no animal has been found, display an error screen
         return res.render('error', {

app/routes/index.js

@@ -68,7 +68,7 @@ router.get('/', async function (req, res) {
         const buildings = await ngsiLD.listEntities(
             {
                 type: 'Building',
-                options: 'concise',
+                format: 'keyValues',
                 attrs: 'name',
                 limit: ENTITY_LIMIT
             },
@@ -78,7 +78,7 @@ router.get('/', async function (req, res) {
         const animals = await ngsiLD.listEntities(
             {
                 type: 'Animal',
-                options: 'concise',
+                format: 'keyValues',
                 attrs: 'name,species',
                 limit: ENTITY_LIMIT
             },
@@ -88,7 +88,7 @@ router.get('/', async function (req, res) {
         const parcels = await ngsiLD.listEntities(
             {
                 type: 'AgriParcel',
-                options: 'concise',
+                format: 'keyValues',
                 attrs: 'name',
                 limit: ENTITY_LIMIT
             },
@@ -99,7 +99,7 @@ router.get('/', async function (req, res) {
         const devices = await ngsiLD.listEntities(
             {
                 type: 'Device',
-                options: 'concise',
+                format: 'keyValues',
                 attrs: 'name',
                 limit: ENTITY_LIMIT
             },

app/views/agri-device.pug

@@ -81,7 +81,7 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled Entity
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(device, null, 4)}
 

app/views/agri-farm.pug

@@ -98,6 +98,6 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(farm, null, 4)}

app/views/animal.pug

@@ -2,7 +2,7 @@ extends layout
 
 block content
   h1
-    | #{animal.name} - 
+    | #{animal.name.value} - 
     - if (animal.id)
       small
         code(style="text-transform:initial")
@@ -22,11 +22,11 @@ block content
                 dl.row
                   - if (animal.species)
                     dt.col-lg-3 Species: 
-                    dd.col-lg-9 #{animal.species}
-                  - if (animal.legalId||animal.legalID)
+                    dd.col-lg-9 #{animal.species.value}
+                  - if (animal.legalId||animal.legalID.value)
                     dt.col-lg-3 Legal ID: 
                     dd.col-lg-9
-                      code #{animal.legalId||animal.legalID}
+                      code #{animal.legalId.value||animal.legalID.value}
                   - if (animal.phenologicalCondition)
                     dt.col-lg-3 Phenological
                       br 
@@ -44,10 +44,10 @@ block content
                     dt.col-lg-3 Sex: 
                     dd.col-lg-3 #{animal.sex.vocab||animal.sex}
                     dt.col-lg-3 Date of Birth: 
-                    dd.col-lg-3 #{animal.birthdate ? animal.birthdate.substring(0,10) : 'unknown'}
+                    dd.col-lg-3 #{animal.birthdate ? animal.birthdate.value.substring(0,10) : 'unknown'}
                   - if (animal.fedWith)
                     dt.col-lg-3 Fed With: 
-                    dd.col-lg-3 #{animal.fedWith}
+                    dd.col-lg-3 #{animal.fedWith.value}
                     - if (animal.weight)
                       dt.col-lg-3 Weight
                       dd.col-lg-3
@@ -114,7 +114,7 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (normalised)
             details
               pre 
                 code #{JSON.stringify(animal, null, 4)}

app/views/building.pug

@@ -51,7 +51,7 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(building, null, 4)}
   div.row

app/views/crop.pug

@@ -37,6 +37,6 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(crop, null, 4)}

app/views/land.pug

@@ -58,6 +58,6 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(land, null, 4)}

app/views/person.pug

@@ -18,6 +18,6 @@ block content
     div.col
       div(class="card m-2")
         div.card-body
-          summary.list-unstyled
+          summary.list-unstyled Entity (simplified)
             details
               pre #{JSON.stringify(person, null, 4)}