Merge branch 'develop'

slsfi · Jan 8, 2023 · bd89e58 · bd89e58
2 parents 11d4756 + 7aea888
commit bd89e58
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 27 deletions.
diff --git a/src/app/services/elastic-search/elastic-search.service.ts b/src/app/services/elastic-search/elastic-search.service.ts
@@ -191,14 +191,14 @@ export class ElasticSearchService {
 
     // Add text type filter that applies to all queries.
     if (this.textTypes && Array.isArray(this.textTypes) && this.textTypes.length > 0) {
-      payload.query.function_score.query.bool.must.push({ 'terms': { "text_type": this.textTypes } });
+      payload.query.function_score.query.bool.must.push({ 'terms': { 'text_type': this.textTypes } });
     }
 
     if (facetGroups) {
       this.injectFacetsToPayload(payload, facetGroups);
     }
 
-    console.log('search payload', payload);
+    // console.log('search payload', payload);
 
     return payload;
   }
@@ -263,7 +263,7 @@ export class ElasticSearchService {
 
     // Add text type filter that applies to all queries.
     if (this.textTypes && Array.isArray(this.textTypes) && this.textTypes.length > 0) {
-      payload.query.function_score.query.bool.must.push({ 'terms': { "text_type": this.textTypes } });
+      payload.query.function_score.query.bool.must.push({ 'terms': { 'text_type': this.textTypes } });
     }
 
     if (facetGroups || range) {
@@ -272,7 +272,7 @@ export class ElasticSearchService {
       this.injectUnfilteredAggregationsToPayload(payload);
     }
 
-    console.log('aggregation payload', payload);
+    // console.log('aggregation payload', payload);
 
     return payload;
   }
@@ -323,7 +323,7 @@ export class ElasticSearchService {
       }
     }
 
-    console.log('suggestions payload', payload);
+    // console.log('suggestions payload', payload);
 
     return payload;
   }

diff --git a/src/app/services/tooltips/tooltip.service.ts b/src/app/services/tooltips/tooltip.service.ts
@@ -14,9 +14,9 @@ export class TooltipService {
   private apiEndPoint: string;
   private projectMachineName: string;
   languageSubscription: Subscription;
-  uncertainPersonCorrespTranslation: string;
-  fictionalPersonCorrespTranslation: string;
-  BCTranslation: string;
+  uncertainPersonCorrespTranslation = '';
+  fictionalPersonCorrespTranslation = '';
+  BCTranslation = 'BC';
 
   constructor(
     private http: Http,
@@ -28,6 +28,8 @@ export class TooltipService {
     this.apiEndPoint = this.config.getSettings('app.apiEndpoint');
     this.projectMachineName = this.config.getSettings('app.machineName');
 
+    this.updateTranslations();
+
     this.languageSubscription = this.langService.languageSubjectChange().subscribe(lang => {
       if (lang) {
         this.updateTranslations();

diff --git a/src/pages/elastic-search/elastic-search.ts b/src/pages/elastic-search/elastic-search.ts
@@ -144,7 +144,7 @@ export class ElasticSearchPage {
     private analyticsService: AnalyticsService,
     public commonFunctions: CommonFunctionsService
   ) {
-    console.log('constructing elastic search');
+    // console.log('constructing elastic search');
 
     try {
       this.hitsPerPage = this.config.getSettings('ElasticSearch.hitsPerPage');
@@ -302,7 +302,7 @@ export class ElasticSearchPage {
   }
 
   ionViewWillEnter() {
-    console.log('will enter elastic search');
+    // console.log('will enter elastic search');
     this.events.publish('ionViewWillEnter', this.constructor.name)
     this.events.publish('tableOfContents:unSelectSelectedTocItem', {'selected': 'elastic-search'});
     this.events.publish('SelectedItemInMenu', {
@@ -449,7 +449,7 @@ export class ElasticSearchPage {
     if (from && to) {
       // Certain date range
       this.range = {from, to};
-      console.log('year range: ', this.range);
+      // console.log('year range: ', this.range);
 
       this.disableFacetCheckboxes = true;
       this.cf.detectChanges();
@@ -492,7 +492,7 @@ export class ElasticSearchPage {
    * Use debouncedSearch to wait for additional key presses when use types.
    */
   private search({ done, initialSearch }: SearchOptions = {}) {
-    console.log(`search from ${this.from} to ${this.from + this.hitsPerPage}`);
+    // console.log(`search from ${this.from} to ${this.from + this.hitsPerPage}`);
 
     this.currentQuery = this.queries[0];
     this.elasticError = false;
@@ -520,7 +520,7 @@ export class ElasticSearchPage {
         this.elasticError = true;
       } else {
         this.total = data.hits.total.value;
-        console.log('hits: ', data.hits);
+        // console.log('hits: ', data.hits);
 
         // Append new hits to this.hits array.
         Array.prototype.push.apply(this.hits, data.hits.hits.map((hit: any) => ({
@@ -563,7 +563,7 @@ export class ElasticSearchPage {
       range: this.range,
     }).subscribe(
       (data: any) => {
-        console.log('aggregation data', data);
+        // console.log('aggregation data', data);
         this.populateFacets(data.aggregations);
       },
       error => {

diff --git a/src/pages/person-search/person-search.html b/src/pages/person-search/person-search.html
@@ -7,18 +7,18 @@ <h1 *ngIf="pageTitle" class="page-title">{{ pageTitle }}</h1>
         </div>
       </ion-row>
       <ion-row class="search-area-row">
-          <ion-col col-10>
+          <ion-col>
             <ion-row *ngIf="('SearchApp.infotext' | translate) !== 'SearchApp.infotext' && ('SearchApp.infotext' | translate).length>0">
                 <ion-col col-12>
                   <p class="info_text">{{'SearchApp.infotext' | translate}}</p>
                 </ion-col>
             </ion-row>
 
             <ion-row>
-                <ion-col col-10>
+                <ion-col class="searchbar-col" col-10>
                   <ion-searchbar placeholder="{{'SearchApp.search-holder' | translate}}" class="searchbar" [(ngModel)]="searchText" (ionInput)="onSearchInput($event)" (ionClear)="onSearchClear($event)"></ion-searchbar>
                 </ion-col>
-                <ion-col col-2 *ngIf="showFilter">
+                <ion-col class="filter-button-col" col-2 *ngIf="showFilter">
                     <button (click)="openFilterModal()" ion-button><ion-icon class="filter-button" name="funnel"></ion-icon></button>
                 </ion-col>
             </ion-row>
@@ -59,7 +59,7 @@ <h1 *ngIf="pageTitle" class="page-title">{{ pageTitle }}</h1>
             </ion-row>
           </ion-col>
 
-          <ion-col col-2 class="alphabet">
+          <ion-col class="alphabet">
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>
             <button ion-fab mini *ngFor="let letter of alphabet" class="letter" (click)="filterByLetter(letter)">{{letter}}</button>
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>

diff --git a/src/pages/person-search/person-search.scss b/src/pages/person-search/person-search.scss
@@ -72,6 +72,20 @@ page-person-search {
     ion-row.search-area-row {
         padding-top: 1rem;
         padding-bottom: 2rem;
+        width: 100%;
+        max-width: 1000px;
+    }
+
+    .searchbar-col.col {
+        padding-right: 0;
+    }
+
+    .filter-button-col.col {
+        padding-left: 0;
+    }
+
+    .active-filters-row.row {
+        margin: 0 16px;
     }
 
     ion-icon.settings-icon.icon {
@@ -92,6 +106,7 @@ page-person-search {
 
     .alphabet {
         margin-top: 0.5rem;
+        flex-grow: 0;
 
         button {
             margin: 0 !important;

diff --git a/src/pages/place-search/place-search.html b/src/pages/place-search/place-search.html
@@ -7,18 +7,18 @@ <h1 class="page-title">{{ 'TOC.PlaceSearch' | translate }}</h1>
         </div>
       </ion-row>
       <ion-row class="search-area-row">
-          <ion-col col-10>
+          <ion-col>
             <ion-row *ngIf="('SearchApp.infotext' | translate) !== 'SearchApp.infotext' && ('SearchApp.infotext' | translate).length>0">
                 <ion-col col-12>
                   <p class="info_text">{{'SearchApp.infotext' | translate}}</p>
                 </ion-col>
             </ion-row>
 
             <ion-row>
-                <ion-col col-10>
+                <ion-col class="searchbar-col" col-10>
                   <ion-searchbar placeholder="{{'SearchApp.search-holder' | translate}}" class="searchbar" [(ngModel)]="searchText" (ionInput)="onSearchInput($event)" (ionClear)="onSearchClear($event)"></ion-searchbar>
                 </ion-col>
-                <ion-col col-2 *ngIf="showFilter">
+                <ion-col class="filter-button-col" col-2 *ngIf="showFilter">
                     <button (click)="openFilterModal()" ion-button><ion-icon class="filter-button" name="funnel"></ion-icon></button>
                 </ion-col>
             </ion-row>
@@ -55,7 +55,7 @@ <h1 class="page-title">{{ 'TOC.PlaceSearch' | translate }}</h1>
             </ion-row>
           </ion-col>
 
-          <ion-col col-2 class="alphabet">
+          <ion-col class="alphabet">
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>
             <button ion-fab mini *ngFor="let letter of alphabet" class="letter" (click)="filterByLetter(letter)">{{letter}}</button>
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>

diff --git a/src/pages/place-search/place-search.scss b/src/pages/place-search/place-search.scss
@@ -72,6 +72,20 @@ page-place-search {
     ion-row.search-area-row {
         padding-top: 1rem;
         padding-bottom: 2rem;
+        width: 100%;
+        max-width: 1000px;
+    }
+
+    .searchbar-col.col {
+        padding-right: 0;
+    }
+
+    .filter-button-col.col {
+        padding-left: 0;
+    }
+
+    .active-filters-row.row {
+        margin: 0 16px;
     }
 
     ion-icon.settings-icon.icon {
@@ -92,6 +106,7 @@ page-place-search {
 
     .alphabet {
         margin-top: 0.5rem;
+        flex-grow: 0;
 
         button {
             margin: 0 !important;

diff --git a/src/pages/tag-search/tag-search.html b/src/pages/tag-search/tag-search.html
@@ -7,18 +7,18 @@ <h1 class="page-title">{{ 'TOC.TagSearch' | translate }}</h1>
         </div>
       </ion-row>
       <ion-row class="search-area-row">
-          <ion-col col-10>
+          <ion-col>
             <ion-row *ngIf="('SearchApp.infotext' | translate) !== 'SearchApp.infotext' && ('SearchApp.infotext' | translate).length>0">
               <ion-col col-12>
                 <p class="info_text">{{'SearchApp.infotext' | translate}}</p>
               </ion-col>
             </ion-row>
 
             <ion-row>
-                <ion-col col-10>
+                <ion-col class="searchbar-col" col-10>
                   <ion-searchbar placeholder="{{'SearchApp.search-holder' | translate}}" class="searchbar" [(ngModel)]="searchText" (ionInput)="onSearchInput($event)" (ionClear)="onSearchClear($event)"></ion-searchbar>
                 </ion-col>
-                <ion-col col-2 *ngIf="showFilter">
+                <ion-col class="filter-button-col" col-2 *ngIf="showFilter">
                     <button (click)="openFilterModal()" ion-button><ion-icon class="filter-button" name="funnel"></ion-icon></button>
                 </ion-col>
             </ion-row>
@@ -55,7 +55,7 @@ <h1 class="page-title">{{ 'TOC.TagSearch' | translate }}</h1>
             </ion-row>
           </ion-col>
 
-          <ion-col col-2 class="alphabet">
+          <ion-col class="alphabet">
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>
             <button ion-fab mini *ngFor="let letter of alphabet" class="letter" (click)="filterByLetter(letter)">{{letter}}</button>
             <button ion-fab mini (click)="showAll()"><ion-icon name="refresh"></ion-icon></button>

diff --git a/src/pages/tag-search/tag-search.scss b/src/pages/tag-search/tag-search.scss
@@ -72,6 +72,20 @@ page-tag-search {
     ion-row.search-area-row {
         padding-top: 1rem;
         padding-bottom: 2rem;
+        width: 100%;
+        max-width: 1000px;
+    }
+
+    .searchbar-col.col {
+        padding-right: 0;
+    }
+
+    .filter-button-col.col {
+        padding-left: 0;
+    }
+
+    .active-filters-row.row {
+        margin: 0 16px;
     }
 
     ion-icon.settings-icon.icon {
@@ -92,6 +106,7 @@ page-tag-search {
 
     .alphabet {
         margin-top: 0.5rem;
+        flex-grow: 0;
 
         button {
             margin: 0 !important;

diff --git a/src/pages/work-search/work-search.ts b/src/pages/work-search/work-search.ts
@@ -427,7 +427,7 @@ export class WorkSearchPage {
         if (data[i].sortBy && data[i - 1].sortBy) {
           if (data[i].sortBy.length > 1 && data[i - 1].sortBy.length > 1) {
             if (data[i].sortBy.charAt(0) !== data[i - 1].sortBy.charAt(0)) {
-              console.log(data[i].sortBy.charAt(0) + ' != ' + data[i - 1].sortBy.charAt(0))
+              // console.log(data[i].sortBy.charAt(0) + ' != ' + data[i - 1].sortBy.charAt(0));
               const ltr = data[i].sortBy.charAt(0);
               if (ltr.length === 1 && ltr.match(/[a-z]/i)) {
                 data[i]['firstOfItsKind'] = data[i].sortBy.charAt(0);