added pagination #2

src/@noctua.search/components/search-history/search-history.component.ts

@@ -1,15 +1,49 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Subject } from 'rxjs';
+import { NoctuaFormConfigService, NoctuaUserService } from 'noctua-form-base';
+import { NoctuaSearchService } from './../..//services/noctua-search.service';
+import { NoctuaSearchMenuService } from '../../services/search-menu.service';
 
 @Component({
   selector: 'noc-search-history',
   templateUrl: './search-history.component.html',
   styleUrls: ['./search-history.component.scss']
 })
-export class SearchHistoryComponent implements OnInit {
+export class SearchHistoryComponent implements OnInit, OnDestroy {
+  searchCriteria: any = {};
 
-  constructor() { }
+  private unsubscribeAll: Subject<any>;
 
-  ngOnInit() {
+  constructor(public noctuaUserService: NoctuaUserService,
+    public noctuaSearchMenuService: NoctuaSearchMenuService,
+    private noctuaSearchService: NoctuaSearchService,
+    public noctuaFormConfigService: NoctuaFormConfigService) {
+    // this.groups = this.noctuaSearchService.groups;
+    this.unsubscribeAll = new Subject();
   }
 
+  ngOnInit(): void {
+    //this.searchForm = this.createSearchForm();
+  }
+
+  selectGroup(group) {
+    this.searchCriteria.group = group;
+    this.noctuaSearchService.search(this.searchCriteria);
+  }
+
+
+  search() {
+    let searchCriteria
+
+    this.noctuaSearchService.search(searchCriteria);
+  }
+
+  close() {
+    this.noctuaSearchMenuService.closeLeftDrawer();
+  }
+
+  ngOnDestroy(): void {
+    this.unsubscribeAll.next();
+    this.unsubscribeAll.complete();
+  }
 }

src/@noctua.search/models/cam-page.ts

@@ -1,5 +1,5 @@
 export class Page {
-  size = 0;
+  size = 50;
   total = 0;
   pageNumber = 0;
 }

src/@noctua.search/models/search-criteria.ts

@@ -1,7 +1,9 @@
 import { Cam, Contributor, Group, Organism } from 'noctua-form-base';
 import { each } from 'lodash';
+import { CamPage } from './cam-page';
 
 export class SearchCriteria {
+    camPage: CamPage = new CamPage();
     titles: any[] = [];
     gps: any[] = [];
     goterms: any[] = [];
@@ -17,7 +19,9 @@ export class SearchCriteria {
 
     query() {
         const self = this;
-        let query = ['offset=0&limit=50'];
+        const query = ['offset=' + (self.camPage.pageNumber * self.camPage.size).toString()];
+
+        query.push('limit=' + self.camPage.size.toString());
 
         each(self.titles, (title) => {
             query.push(`title=${title}`);
@@ -60,7 +64,9 @@ export class SearchCriteria {
 
     queryEncoded() {
         const self = this;
-        const query = ['offset=0&limit=50'];
+        const query = ['offset=' + (self.camPage.pageNumber * self.camPage.size).toString()];
+
+        query.push('limit=' + self.camPage.size.toString());
 
         each(self.titles, (title) => {
             query.push(`title=${encodeURIComponent(title)}`);

src/@noctua.search/services/noctua-search.service.ts

@@ -16,7 +16,6 @@ import {
     Entity,
     Article,
     noctuaFormConfig,
-    // CamPage
 } from 'noctua-form-base';
 import { SearchCriteria } from './../models/search-criteria';
 import { saveAs } from 'file-saver';
@@ -120,6 +119,11 @@ export class NoctuaSearchService {
         this.updateSearch();
     }
 
+    getPage(pageNumber: number) {
+        this.searchCriteria.camPage.pageNumber = pageNumber;
+        this.updateSearch();
+    }
+
     paramsToSearch(param) {
         this.searchCriteria = new SearchCriteria();
 

src/app/main/apps/noctua-search/cams/cams-table/cams-table.component.ts

@@ -13,10 +13,8 @@ import { SparqlService } from '@noctua.sparql/services/sparql/sparql.service';
 
 import {
   NoctuaFormConfigService,
-  CamService
 } from 'noctua-form-base';
 
-import { Cam } from 'noctua-form-base';
 import { MatPaginator } from '@angular/material';
 import { CamPage } from '@noctua.search/models/cam-page';
 import { NoctuaSearchMenuService } from '@noctua.search/services/search-menu.service';
@@ -64,9 +62,6 @@ export class CamsTableComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-
-    console.log('pp')
-
     this.noctuaSearchService.onCamsChanged
       .pipe(takeUntil(this._unsubscribeAll))
       .subscribe(cams => {
@@ -92,11 +87,14 @@ export class CamsTableComponent implements OnInit, OnDestroy {
 
   search() {
     const searchCriteria = this.searchForm.value;
-    console.dir(searchCriteria);
     this.noctuaSearchService.search(searchCriteria);
   }
 
-
+  setPage($event) {
+    if (this.camPage) {
+      this.noctuaSearchService.getPage($event.pageIndex);
+    }
+  }
 
   ngOnDestroy(): void {
     this._unsubscribeAll.next();

src/app/main/apps/noctua-search/noctua-search.component.ts

@@ -6,9 +6,7 @@ import { noctuaAnimations } from './../../../../@noctua/animations';
 import {
   Cam,
   Contributor,
-  NoctuaUserService,
-  NoctuaFormConfigService,
-  NoctuaAnnotonFormService
+  NoctuaUserService
 } from 'noctua-form-base';
 
 import { FormGroup } from '@angular/forms';