From ca1e2b49cbf39439e0bf73c1b794a5a6e8bc6ef2 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Mon, 3 Dec 2018 12:32:33 +0000
Subject: [PATCH] 1. Simple & Advanced Search pages:         in sorting
 functionality for Date, add ascending (oldest) and descending (newest)
 options.         remove margin between paging and search results.        
 show and hide sorting and results per page functionalities (like paging)
 according to results and loading.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54075 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../advanced/advancedSearchDatasets.component.ts  |  2 +-
 .../advanced/advancedSearchOrps.component.ts      |  2 +-
 .../advancedSearchPublications.component.ts       |  2 +-
 .../advanced/advancedSearchSoftware.component.ts  |  2 +-
 .../searchUtils/advancedSearchPage.component.html |  8 +++++---
 .../searchUtils/advancedSearchPage.component.ts   |  3 +++
 searchPages/searchUtils/searchPage.component.html | 15 +++++++++++----
 searchPages/searchUtils/searchPage.component.ts   |  1 +
 searchPages/searchUtils/searchPaging.component.ts |  2 +-
 .../searchUtils/searchSorting.component.ts        |  3 ++-
 searchPages/simple/searchDatasets.component.ts    |  2 +-
 searchPages/simple/searchOrps.component.ts        |  2 +-
 .../simple/searchPublications.component.ts        |  2 +-
 searchPages/simple/searchSoftware.component.ts    |  2 +-
 14 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/searchPages/advanced/advancedSearchDatasets.component.ts b/searchPages/advanced/advancedSearchDatasets.component.ts
index c54b7fb5..cd0ac49b 100644
--- a/searchPages/advanced/advancedSearchDatasets.component.ts
+++ b/searchPages/advanced/advancedSearchDatasets.component.ts
@@ -88,7 +88,7 @@ export class AdvancedSearchDatasetsComponent {
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/advanced/advancedSearchOrps.component.ts b/searchPages/advanced/advancedSearchOrps.component.ts
index 8caa00c3..913c9b2e 100644
--- a/searchPages/advanced/advancedSearchOrps.component.ts
+++ b/searchPages/advanced/advancedSearchOrps.component.ts
@@ -88,7 +88,7 @@ export class AdvancedSearchOrpsComponent {
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/advanced/advancedSearchPublications.component.ts b/searchPages/advanced/advancedSearchPublications.component.ts
index 118a1454..393d8363 100644
--- a/searchPages/advanced/advancedSearchPublications.component.ts
+++ b/searchPages/advanced/advancedSearchPublications.component.ts
@@ -93,7 +93,7 @@ export class AdvancedSearchPublicationsComponent {
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/advanced/advancedSearchSoftware.component.ts b/searchPages/advanced/advancedSearchSoftware.component.ts
index 16e05bb1..c7c27f6d 100644
--- a/searchPages/advanced/advancedSearchSoftware.component.ts
+++ b/searchPages/advanced/advancedSearchSoftware.component.ts
@@ -89,7 +89,7 @@ export class AdvancedSearchSoftwareComponent {
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/searchUtils/advancedSearchPage.component.html b/searchPages/searchUtils/advancedSearchPage.component.html
index c83ba483..1eb38b1d 100644
--- a/searchPages/searchUtils/advancedSearchPage.component.html
+++ b/searchPages/searchUtils/advancedSearchPage.component.html
@@ -41,7 +41,8 @@
             <div class="uk-width-expand@m uk-with-1-1@s">
               <div *ngIf="openaireLink"> <a class="uk-margin-top   uk-button uk-button-text"  [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>
               <div  class="uk-align-center uk-margin-remove-bottom">
-                <div class="uk-grid uk-margin-top uk-margin-bottom">
+                <div *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"
+                      class="uk-grid uk-margin-top uk-margin-bottom">
                   <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"></search-results-per-page>
                   <search-sorting class="uk-width-1-2@m uk-width-1-1" *ngIf="sort" [(sortBy)]="searchUtils.sortBy" (sortByChange)="sortByChanged($event)"></search-sorting>
                 </div>
@@ -50,7 +51,7 @@
 
               <search-download class="uk-width-1-1@s uk-hidden@m" [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>
 
-              <div *ngIf="(searchUtils.page <= pagingLimit)" class="uk-margin-top">
+              <div *ngIf="(searchUtils.page <= pagingLimit)" class="">
                 <search-result  [results]="results"
                                 [status]=searchUtils.status
                                 [type]="entityType"
@@ -63,7 +64,8 @@
               </div>
 
               <div  class="uk-align-center uk-margin-remove-bottom">
-                <div class="uk-grid uk-margin-top uk-margin-bottom">
+                <div *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"
+                      class="uk-grid uk-margin-top uk-margin-bottom">
                   <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"></search-results-per-page>
                   <search-sorting class="uk-width-1-2@m uk-width-1-1" *ngIf="sort" [(sortBy)]="searchUtils.sortBy" (sortByChange)="sortByChanged($event)"></search-sorting>
                 </div>
diff --git a/searchPages/searchUtils/advancedSearchPage.component.ts b/searchPages/searchUtils/advancedSearchPage.component.ts
index d40e892a..ce9929d4 100644
--- a/searchPages/searchUtils/advancedSearchPage.component.ts
+++ b/searchPages/searchUtils/advancedSearchPage.component.ts
@@ -12,6 +12,7 @@ import {SearchFields, FieldDetails}   from '../../utils/properties/searchFields'
 import {SearchUtilsClass}             from './searchUtils.class';
 import {ModalLoading}                 from '../../utils/modal/loading.component';
 import {StringUtils, Dates}           from '../../utils/string-utils.class';
+import {ErrorCodes}                   from '../../utils/properties/errorCodes';
 
 import {PiwikService}                 from '../../utils/piwik/piwik.service';
 import {EnvProperties}                from '../../utils/properties/env-properties';
@@ -54,6 +55,8 @@ export class AdvancedSearchPageComponent {
   public resultsPerPage: number = 0;
   isPiwikEnabled = false;
   properties:EnvProperties;
+  public errorCodes:ErrorCodes = new ErrorCodes();
+
   url = null;
   @Output() queryChange  = new EventEmitter();
   constructor (private route: ActivatedRoute,
diff --git a/searchPages/searchUtils/searchPage.component.html b/searchPages/searchUtils/searchPage.component.html
index 311fa91b..d1cccdf9 100644
--- a/searchPages/searchUtils/searchPage.component.html
+++ b/searchPages/searchUtils/searchPage.component.html
@@ -89,9 +89,13 @@
             </div>
           </div>
 
+<!-- uk-sticky="offset: 120" -->
+<!-- <div *ngIf="showRefine" class="uk-width-1-5 uk-margin-top helper-left-right search-filters uk-visible@m"> -->
 
           <div  class="uk-grid uk-width-1-1">
-            <div  *ngIf="showRefine" class=" uk-margin-top helper-left-right search-filters uk-visible@m">
+            <div *ngIf="showRefine" class="uk-margin-top helper-left-right search-filters uk-visible@m">
+              <!-- top: #container-1; bottom: #true; -->
+              <!-- <div id="container-1" style="z-index: -1;" uk-sticky="top: #container-1; offset: 120; "> -->
                <helper position="left" before="true"></helper>
                <div   class="uk-width-1-1   uk-margin-small-bottom ">
 
@@ -138,13 +142,15 @@
                <search-filter  *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)"  [(connectCommunityId)]=connectCommunityId></search-filter>
                <helper position="left" before="false"></helper>
             </div>
+            <!-- </div> -->
             <helper *ngIf="!showRefine" class="uk-margin-top helper-left-right uk-visible@m" position="left"></helper>
 
             <div class="uk-width-expand@m uk-width-1-1@s uk-first-column">
             <!-- <div [class]="(showRefine)?'uk-width-expand@m uk-first-column':''" > -->
               <div *ngIf="openaireLink"> <a class="uk-margin-top   uk-button uk-button-text"  [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>
               <div  class="uk-align-center uk-margin-remove-bottom">
-                <div class="uk-grid uk-margin-top uk-margin-bottom">
+                <div *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"
+                      class="uk-grid uk-margin-top uk-margin-bottom">
                   <!-- <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(searchUtils)] = "searchUtils" [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-results-per-page> -->
                   <!-- <search-sorting class="uk-width-1-2@m uk-width-1-1" *ngIf="sort" [(searchUtils)] = "searchUtils" [(sortBy)]="sortBy" [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-sorting> -->
                   <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"></search-results-per-page>
@@ -164,7 +170,7 @@
                 <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
               </div> -->
 
-              <div *ngIf="(searchUtils.page <= pagingLimit)" class="uk-margin-top">
+              <div *ngIf="(searchUtils.page <= pagingLimit)" class="">
                 <search-result    *ngIf="!tableView"
                                   [results]="results"
                                   [status]="searchUtils.status"
@@ -178,7 +184,8 @@
               </div>
 
               <div  class="uk-align-center uk-margin-remove-bottom">
-                <div class="uk-grid uk-margin-top uk-margin-bottom">
+                <div *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)"
+                      class="uk-grid uk-margin-top uk-margin-bottom">
                   <search-results-per-page class="uk-width-1-2@m uk-width-1-1" [(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"></search-results-per-page>
                   <!-- <search-results-per-page class="uk-width-1-2@m uk-width-1-1"></search-results-per-page> -->
                   <!--[(size)]="searchUtils.size" (sizeChange)="sizeChanged($event)"-->
diff --git a/searchPages/searchUtils/searchPage.component.ts b/searchPages/searchUtils/searchPage.component.ts
index f308bfc9..19d92800 100644
--- a/searchPages/searchUtils/searchPage.component.ts
+++ b/searchPages/searchUtils/searchPage.component.ts
@@ -70,6 +70,7 @@ export class SearchPageComponent {
   public resultsPerPage: number = 0;
   public isPiwikEnabled;
   properties:EnvProperties;
+  public errorCodes:ErrorCodes = new ErrorCodes();
 
   constructor (private route: ActivatedRoute,
                private location: Location,
diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts
index 08b897bf..f67bb739 100644
--- a/searchPages/searchUtils/searchPaging.component.ts
+++ b/searchPages/searchUtils/searchPaging.component.ts
@@ -5,7 +5,7 @@ import {ErrorCodes} from '../../utils/properties/errorCodes';
 @Component({
     selector: 'search-paging',
     template: `
-    <div class= "searchPaging uk-panel uk-margin-top uk-margin-bottom uk-grid">
+    <div class= "searchPaging uk-panel uk-margin-top uk-grid">
       <div class="uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > 0">
         {{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(searchUtils.totalResults)|number)}}
       </div>
diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts
index 86733a07..b2915399 100644
--- a/searchPages/searchUtils/searchSorting.component.ts
+++ b/searchPages/searchUtils/searchSorting.component.ts
@@ -28,7 +28,8 @@ import {RouterHelper} from '../../utils/routerHelper.class';
         <select class="uk-select uk-width-2-3@m uk-width-auto" id="form-horizontal-select" name="select_results_per_page"
                 [(ngModel)]="sortBy" (ngModelChange)="sortByChanged()">
                 <option value="">Relevance</option>
-                <option value="resultdateofacceptance,descending">Date</option>
+                <option value="resultdateofacceptance,descending">Date (newest)</option>
+                <option value="resultdateofacceptance,ascending">Date (oldest)</option>
         </select>
       </span>
 
diff --git a/searchPages/simple/searchDatasets.component.ts b/searchPages/simple/searchDatasets.component.ts
index d230c996..d47122ca 100644
--- a/searchPages/simple/searchDatasets.component.ts
+++ b/searchPages/simple/searchDatasets.component.ts
@@ -101,7 +101,7 @@ properties: EnvProperties;
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/simple/searchOrps.component.ts b/searchPages/simple/searchOrps.component.ts
index d2e306ed..2a3f4989 100644
--- a/searchPages/simple/searchOrps.component.ts
+++ b/searchPages/simple/searchOrps.component.ts
@@ -98,7 +98,7 @@ properties: EnvProperties;
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }
 
diff --git a/searchPages/simple/searchPublications.component.ts b/searchPages/simple/searchPublications.component.ts
index 2f5fd249..459c6e90 100644
--- a/searchPages/simple/searchPublications.component.ts
+++ b/searchPages/simple/searchPublications.component.ts
@@ -110,7 +110,7 @@ properties: EnvProperties;
           this.searchUtils.size = 10;
         }
         this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-        if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+        if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
           this.searchUtils.sortBy = "";
         }
 
diff --git a/searchPages/simple/searchSoftware.component.ts b/searchPages/simple/searchSoftware.component.ts
index 9506cf29..9f8b779b 100644
--- a/searchPages/simple/searchSoftware.component.ts
+++ b/searchPages/simple/searchSoftware.component.ts
@@ -100,7 +100,7 @@ properties: EnvProperties;
         this.searchUtils.size = 10;
       }
       this.searchUtils.sortBy = (params['sortBy'])?params['sortBy']:'';
-      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending") {
+      if(this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
         this.searchUtils.sortBy = "";
       }