diff --git a/package.json b/package.json index eea7f479b3..cee3db9ed5 100755 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "planet", "license": "AGPL-3.0", - "version": "0.15.3", + "version": "0.15.4", "myplanet": { - "latest": "v0.20.58", - "min": "v0.19.58" + "latest": "v0.20.61", + "min": "v0.19.61" }, "scripts": { "ng": "ng", diff --git a/src/app/manager-dashboard/reports/reports-myplanet.component.html b/src/app/manager-dashboard/reports/reports-myplanet.component.html index b153e59fb4..e581313d35 100755 --- a/src/app/manager-dashboard/reports/reports-myplanet.component.html +++ b/src/app/manager-dashboard/reports/reports-myplanet.component.html @@ -1,15 +1,28 @@ - - - myPlanet Report - + + + myPlanet Report + + + + + + + + + + + + + + search - + - +
diff --git a/src/app/manager-dashboard/reports/reports-myplanet.component.ts b/src/app/manager-dashboard/reports/reports-myplanet.component.ts index 3d5669ca23..d91f20fe30 100755 --- a/src/app/manager-dashboard/reports/reports-myplanet.component.ts +++ b/src/app/manager-dashboard/reports/reports-myplanet.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, HostListener } from '@angular/core'; import { CouchService } from '../../shared/couchdb.service'; import { forkJoin, of } from 'rxjs'; import { StateService } from '../../shared/state.service'; @@ -10,6 +10,7 @@ import { attachNamesToPlanets, getDomainParams, areNoChildren } from './reports. import { ActivatedRoute } from '@angular/router'; import { switchMap, map } from 'rxjs/operators'; import { findDocuments } from '../../shared/mangoQueries'; +import { DeviceInfoService, DeviceType } from '../../shared/device-info.service'; @Component({ templateUrl: './reports-myplanet.component.html' @@ -20,6 +21,9 @@ export class ReportsMyPlanetComponent implements OnInit { searchValue = ''; planets: any[] = []; isEmpty = false; + isMobile: boolean; + deviceType: DeviceType; + showFiltersRow = false; planetType = this.stateService.configuration.planetType; configuration = this.stateService.configuration; get childType() { @@ -34,13 +38,23 @@ export class ReportsMyPlanetComponent implements OnInit { private planetMessageService: PlanetMessageService, private managerService: ManagerService, private reportsService: ReportsService, - private route: ActivatedRoute - ) {} + private route: ActivatedRoute, + private deviceInfoService: DeviceInfoService, + ) { + this.deviceType = this.deviceInfoService.getDeviceType(); + this.isMobile = this.deviceType === DeviceType.MOBILE; + } ngOnInit() { this.getMyPlanetList(this.route.snapshot.params.hubId); } + @HostListener('window:resize') onResize() { + this.deviceType = this.deviceInfoService.getDeviceType(); + this.isMobile = this.deviceType === DeviceType.MOBILE; + this.showFiltersRow = false + } + filterData(filterValue: string) { this.searchValue = filterValue; this.planets = this.allPlanets.filter(planet => filterSpecificFields([ 'name', 'doc.code' ])(planet, filterValue));