FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/vectortileselect

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Willem Dantuma 2021-01-21 11:04:57 +01:00
commit 9376c236aa
5 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@ -423,6 +423,12 @@
"ms": "^2.1.1" "ms": "^2.1.1"
} }
}, },
"ini": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true
},
"uuid": { "uuid": {
"version": "8.3.0", "version": "8.3.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
@ -1767,23 +1773,25 @@
} }
}, },
"@farmmaps/common": { "@farmmaps/common": {
"version": "0.0.1-prerelease.467", "version": "0.0.1-prerelease.478",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.467.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.478.tgz",
"integrity": "sha512-Gg+tWz/3jFnPbXr66tdOf7HJ0vFwLO8MWDIIMN8PYaHUP1Xu23w9uuyZSLvQxKFPcPwf7ehKNXFxBzMV1e6kpw==", "integrity": "sha512-6gnsQiMYHpZt8yAUoURKlQQM+4ICB5KV2varDaUZKGyraSQpzlYrSS3Ru0bokpbPpr3DutcyOFSS68li5KsKhA==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map": { "@farmmaps/common-map": {
"version": "file:dist/common-map", "version": "0.0.1-prerelease.478",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.478.tgz",
"integrity": "sha512-/Q07gnwvluizvdMqgjJ2n3nJspQKjbKKnGEWyJcy69ZqoSAL5aTS8G1EE/Jl+rJx6/A6NjbR5syxQ5k7ofrl9A==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map3d": { "@farmmaps/common-map3d": {
"version": "0.0.1-prerelease.467", "version": "0.0.1-prerelease.478",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.467.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.478.tgz",
"integrity": "sha512-H1ICGeuyLbSYN85I1lpDQrD1HL3zf3yxmpNs2Jzog2N8jLpRByWaonsOoEeZ5E3fF3xWejhIOEJDIYd+/7AGyg==", "integrity": "sha512-OZSsQWEsRNsvpI3IngGnT0s0/FzgvLw75DeXPyTFzwa3m1O+ePiFB6V8yei6my+bKW7axhkM0eh98ThMgKojmg==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
@ -2065,6 +2073,14 @@
"pacote": "9.5.12", "pacote": "9.5.12",
"semver": "7.3.2", "semver": "7.3.2",
"semver-intersect": "1.4.0" "semver-intersect": "1.4.0"
},
"dependencies": {
"ini": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true
}
} }
}, },
"@types/color-name": { "@types/color-name": {

6
package.json
View File

@ -19,9 +19,9 @@
"@angular/platform-browser": "~10.1.3", "@angular/platform-browser": "~10.1.3",
"@angular/platform-browser-dynamic": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3",
"@angular/router": "~10.1.3", "@angular/router": "~10.1.3",
"@farmmaps/common": ">=0.0.1-prerelease.467 <0.0.1", "@farmmaps/common": ">=0.0.1-prerelease.478 <0.0.1",
"@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map": ">=0.0.1-prerelease.478 <0.0.1",
"@farmmaps/common-map3d": ">=0.0.1-prerelease.467 <0.0.1", "@farmmaps/common-map3d": ">=0.0.1-prerelease.478 <0.0.1",
"@microsoft/signalr": "^3.1.3", "@microsoft/signalr": "^3.1.3",
"@ng-bootstrap/ng-bootstrap": "^7.0", "@ng-bootstrap/ng-bootstrap": "^7.0",
"@ngrx/effects": "^10.0", "@ngrx/effects": "^10.0",

6
projects/common/src/fm/components/has-package/has-package.directive.ts
View File

@ -16,7 +16,11 @@ export class HasPackageDirective implements OnInit,OnDestroy{
private packSub:Subscription; private packSub:Subscription;
ngOnInit() { ngOnInit() {
this.packages$.subscribe((packages) => { this.packages$.subscribe((packages) => {
if (packages[this.package] && packages[this.package].enabled) { const today = new Date(new Date(Date.now()).toUTCString()).setHours(0,0,0,0);
if (packages[this.package] &&
packages[this.package].enabled &&
(packages[this.package].dataDate && new Date(packages[this.package].dataDate).setHours(0, 0, 0, 0) <= today) &&
(packages[this.package].dataEndDate == null || new Date(packages[this.package].dataEndDate).setHours(0, 0, 0, 0) >= today)) {
this.viewContainerRef$.createEmbeddedView(this.templateRef$); this.viewContainerRef$.createEmbeddedView(this.templateRef$);
this.hasView=true; this.hasView=true;
} else if (this.hasView) { } else if (this.hasView) {

2
projects/common/src/fm/models/package.ts
View File

@ -2,6 +2,8 @@ export interface IPackage {
id:string id:string
name:string; name:string;
enabled?:boolean; enabled?:boolean;
dataDate?:Date;
dataEndDate?:Date;
} }
export interface IPackages { export interface IPackages {

4
projects/common/src/fm/reducers/app-common.reducer.ts
View File

@ -116,7 +116,9 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
let a = action as appCommonActions.InitUserPackagesSuccess; let a = action as appCommonActions.InitUserPackagesSuccess;
let packages = {} let packages = {}
a.items.forEach((item) => { a.items.forEach((item) => {
packages[item.data.id]=item.data; item.data.dataDate = item.dataDate;
item.data.dataEndDate = item.dataEndDate;
packages[item.data.id]=item.data;
}); });
return tassign(state,{userPackages:packages}); return tassign(state,{userPackages:packages});