Sort Entities.

Author: jason-fox

app/app.js

@@ -51,8 +51,6 @@ 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/routes/index.js

@@ -65,52 +65,62 @@ router.get('/', async function (req, res) {
     const headers = ngsiLD.setHeaders(req.session.access_token, LinkHeader);
     try {
         monitor('NGSI', 'listEntities ?type=Building');
-        const buildings = await ngsiLD.listEntities(
+        const getBuildings = await ngsiLD.listEntities(
             {
                 type: 'Building',
                 format: 'keyValues',
-                attrs: 'name',
+                pick: 'id,name',
                 limit: ENTITY_LIMIT
             },
             headers
         );
+        const buildings = getBuildings.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+        });
         monitor('NGSI', 'listEntities ?type=Animal');
         const animals = await ngsiLD.listEntities(
             {
                 type: 'Animal',
                 format: 'keyValues',
-                attrs: 'name,species',
+                pick: 'id,name,species,phenologicalCondition',
                 limit: ENTITY_LIMIT
             },
             headers
         );
         monitor('NGSI', 'listEntities ?type=AgriParcel');
-        const parcels = await ngsiLD.listEntities(
+        const getParcels = await ngsiLD.listEntities(
             {
                 type: 'AgriParcel',
                 format: 'keyValues',
-                attrs: 'name',
+                pick: 'id,name',
                 limit: ENTITY_LIMIT
             },
             headers
         );
+        const parcels = getParcels.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+        });
 
         monitor('NGSI', 'listEntities ?type=Device');
         const devices = await ngsiLD.listEntities(
             {
                 type: 'Device',
                 format: 'keyValues',
-                attrs: 'name',
+                pick: 'id,name',
                 limit: ENTITY_LIMIT
             },
             headers
         );
 
         const cows = _.filter(animals, (o) => {
             return o.species === 'dairy cattle';
+        }).sort((a, b) => {
+            return a.name.localeCompare(b.name);
         });
         const pigs = _.filter(animals, (o) => {
             return o.species === 'pig';
+        }).sort((a, b) => {
+            return a.name.localeCompare(b.name);
         });
 
         return res.render('index', {

app/views/animal.pug

@@ -15,7 +15,7 @@ block content
         div.card-body
           div.container
             div.row
-              - if (animal.species == 'dairy cattle')
+              - if (animal.species.value == 'dairy cattle')
                 div.col-lg-3
                   img.img-thumbnail(src=`/img/cow-${imgId}.jpg` width="256px" height="256px") 
               div.col-lg-9

app/views/index.pug

@@ -105,8 +105,21 @@ block content
             ul.list-unstyled
               each animal in cows
                 li
-                  img(class="pe-2" src='/img/cow.svg' width="32" height="32")
-                  a(class="link-underline link-underline-opacity-0" href=`app/animal/${animal.id}`)  #{animal.name}
+                  -  if (animal.phenologicalCondition.vocab.includes('Adult'))
+                    img(class="pe-2" src='/img/cow.svg' width="32" height="32")
+                    a(class="link-underline link-underline-opacity-0" href=`app/animal/${animal.id}`) 
+                  
+                      |  #{animal.name}
+                      - if (animal.phenologicalCondition.vocab === 'maleAdult')
+                        |  the Bull
+                  - else
+                    img(class="ps-1 pe-1" src='/img/cow.svg' width="24" height="24" style="margin:4px")
+                    a(class="link-underline link-underline-opacity-0" href=`app/animal/${animal.id}`) 
+                      | #{animal.name} 
+
+
+
+
     div.col
       div.card
         div.card-body