diff --git a/package-lock.json b/package-lock.json index ed38bbc..7883d7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -423,6 +423,12 @@ "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": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", @@ -1767,23 +1773,25 @@ } }, "@farmmaps/common": { - "version": "0.0.1-prerelease.467", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.467.tgz", - "integrity": "sha512-Gg+tWz/3jFnPbXr66tdOf7HJ0vFwLO8MWDIIMN8PYaHUP1Xu23w9uuyZSLvQxKFPcPwf7ehKNXFxBzMV1e6kpw==", + "version": "0.0.1-prerelease.478", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.478.tgz", + "integrity": "sha512-6gnsQiMYHpZt8yAUoURKlQQM+4ICB5KV2varDaUZKGyraSQpzlYrSS3Ru0bokpbPpr3DutcyOFSS68li5KsKhA==", "requires": { "tslib": "^2.0.0" } }, "@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": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "0.0.1-prerelease.467", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.467.tgz", - "integrity": "sha512-H1ICGeuyLbSYN85I1lpDQrD1HL3zf3yxmpNs2Jzog2N8jLpRByWaonsOoEeZ5E3fF3xWejhIOEJDIYd+/7AGyg==", + "version": "0.0.1-prerelease.478", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.478.tgz", + "integrity": "sha512-OZSsQWEsRNsvpI3IngGnT0s0/FzgvLw75DeXPyTFzwa3m1O+ePiFB6V8yei6my+bKW7axhkM0eh98ThMgKojmg==", "requires": { "tslib": "^2.0.0" } @@ -2065,6 +2073,14 @@ "pacote": "9.5.12", "semver": "7.3.2", "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": { diff --git a/package.json b/package.json index 47378d9..ed3cf74 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", - "@farmmaps/common": ">=0.0.1-prerelease.467 <0.0.1", - "@farmmaps/common-map": "file:dist/common-map", - "@farmmaps/common-map3d": ">=0.0.1-prerelease.467 <0.0.1", + "@farmmaps/common": ">=0.0.1-prerelease.478 <0.0.1", + "@farmmaps/common-map": ">=0.0.1-prerelease.478 <0.0.1", + "@farmmaps/common-map3d": ">=0.0.1-prerelease.478 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", diff --git a/projects/common/src/fm/components/has-package/has-package.directive.ts b/projects/common/src/fm/components/has-package/has-package.directive.ts index 9a4d202..6072785 100644 --- a/projects/common/src/fm/components/has-package/has-package.directive.ts +++ b/projects/common/src/fm/components/has-package/has-package.directive.ts @@ -16,7 +16,11 @@ export class HasPackageDirective implements OnInit,OnDestroy{ private packSub:Subscription; ngOnInit() { 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.hasView=true; } else if (this.hasView) { diff --git a/projects/common/src/fm/models/package.ts b/projects/common/src/fm/models/package.ts index 921953b..850e5fb 100644 --- a/projects/common/src/fm/models/package.ts +++ b/projects/common/src/fm/models/package.ts @@ -2,6 +2,8 @@ export interface IPackage { id:string name:string; enabled?:boolean; + dataDate?:Date; + dataEndDate?:Date; } export interface IPackages { diff --git a/projects/common/src/fm/reducers/app-common.reducer.ts b/projects/common/src/fm/reducers/app-common.reducer.ts index b2f561b..454150c 100644 --- a/projects/common/src/fm/reducers/app-common.reducer.ts +++ b/projects/common/src/fm/reducers/app-common.reducer.ts @@ -116,7 +116,9 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) let a = action as appCommonActions.InitUserPackagesSuccess; let packages = {} 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});