Merge branch 'dspace-cris-7' of bitbucket.org:4Science/dspace-angular into dspace-cris-7

Author: atarix83

src/app/statistics-page/cris-statistics-page/cris-statistics-page.component.html

@@ -21,7 +21,7 @@ <h2>{{'statistics.categories.title' | translate}}</h2>
             <div class="datepicker-container">
               <div class="form-group">
                 <div class="input-group">
-                  <input class="form-control date-input" placeholder="Start Date" name="dp" [(ngModel)]="dateFrom" (ngModelChange)="dateChanged()"
+                  <input class="form-control date-input" placeholder="Start Date" name="dp" [(ngModel)]="dateFrom" (ngModelChange)="startDateChanged()"
                     ngbDatepicker #df="ngbDatepicker">
                   <div class="input-group-append">
                     <button class="btn btn-outline-secondary" (click)="df.toggle()" type="button">
@@ -32,7 +32,7 @@ <h2>{{'statistics.categories.title' | translate}}</h2>
               </div>
               <div class="form-group">
                 <div class="input-group ml-2">
-                  <input class="form-control date-input" placeholder="End Date" name="dp" [(ngModel)]="dateTo" (ngModelChange)="dateChanged()"
+                  <input class="form-control date-input" placeholder="End Date" name="dp" [(ngModel)]="dateTo" (ngModelChange)="endDateChanged()"
                     ngbDatepicker #dt="ngbDatepicker">
 
                   <div class="input-group-append">

src/app/statistics-page/cris-statistics-page/cris-statistics-page.component.ts

@@ -197,10 +197,21 @@ export class CrisStatisticsPageComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Refresh categories when the date from or date to is changed.
+   * Refresh categories when the date from is changed.
    */
-  dateChanged() {
-    this.categories$ = this.getCategories$();
+  startDateChanged() {
+    if (typeof this.dateFrom === 'object' || this.dateFrom === null && this.dateFrom === undefined) {
+      this.categories$ = this.getCategories$();
+    }
+  }
+
+  /**
+   * Refresh categories when the date to is changed.
+   */
+  endDateChanged() {
+    if (typeof this.dateTo === 'object' || this.dateTo === null || this.dateTo === undefined) {
+      this.categories$ = this.getCategories$();
+    }
   }
 
   /**

src/assets/i18n/en.json5

@@ -4750,6 +4750,8 @@
 
   "search.filters.applied.charts.RELATION.Project.fundings.title": "Fundings",
 
+  "search.filters.applied.charts.RELATION.Project.researchoutputs.title": "Research Output",
+
   "search.filters.applied.charts.no.data.found": "No data found",
 
   "search.filters.applied.charts.show.hide": "Show/Hide",