From adae1f074953b1316956cd7a7964a5bb76933426 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 19 Sep 2023 16:38:16 +0300
Subject: [PATCH] [Library | develop]: searchProjects.service.ts: Added more
 checks if startdate and enddate properties exist in the response |
 entity-metadata.component.ts: Added "From" or "Until" before startYear and
 endYear respectively when only one of them exists in data.

---
 landingPages/landing-utils/entity-metadata.component.ts | 4 ++--
 services/searchProjects.service.ts                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts
index c15f50e0..aba2fc82 100644
--- a/landingPages/landing-utils/entity-metadata.component.ts
+++ b/landingPages/landing-utils/entity-metadata.component.ts
@@ -60,10 +60,10 @@ import {RouterHelper} from "../../utils/routerHelper.class";
         <span>{{year}}</span>
       </ng-container>
       <ng-container *ngIf="startYear && !endYear">
-        <span>{{startYear}}</span>
+        <span>From {{startYear}}</span>
       </ng-container>
       <ng-container *ngIf="!startYear && endYear">
-        <span>{{endYear}}</span>
+        <span>Until {{endYear}}</span>
       </ng-container>
       <ng-container *ngIf="startYear && endYear">
         <ng-container>
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index 2109666f..b513b737 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -248,10 +248,10 @@ export class SearchProjectsService {
                   }
                 }
             }
-            if(resData.hasOwnProperty("startdate")) {
+            if(resData.hasOwnProperty("startdate")  && resData['startdate']) {
               result.startYear = resData.startdate.split('-')[0];
             }
-            if(resData.hasOwnProperty("enddate")) {
+            if(resData.hasOwnProperty("enddate") && resData['enddate']) {
               result.endYear = resData.enddate.split('-')[0];
             }
             // Measure