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

Merge branch 'develop'
All checks were successful
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2025-04-05 08:30:19 +02:00
commit 80ef4ed6fe
13 changed files with 98 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "farmmaps-lib-app",
"version": "4.12.1",
"version": "4.14.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "farmmaps-lib-app",
"version": "4.12.1",
"version": "4.14.0",
"dependencies": {
"@angular-eslint/eslint-plugin": "^18.2.0",
"@angular/animations": "18.2.3",
@ -90,14 +90,14 @@
},
"dist/common": {
"name": "@farmmaps/common",
"version": "4.12.0-prerelease.2532",
"version": "4.14.0-prerelease.2544",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": "^18.2.3",
"@angular/core": "^18.2.3",
"@angular/forms": "^18.2.3",
"@angular/common": "18.2.3",
"@angular/core": "18.2.3",
"@angular/forms": "18.2.3",
"@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@ngrx/effects": "^18.0.2",
@ -115,12 +115,12 @@
},
"dist/common-map": {
"name": "@farmmaps/common-map",
"version": "4.12.0-prerelease.2532",
"version": "4.14.0-prerelease.2544",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": "^18.2.3",
"@angular/core": "18.2.3",
"@ngrx/effects": "^18.0.2",
"@ngrx/router-store": "^18.0.2",
"@ngrx/store": "^18.0.2",
@ -130,27 +130,27 @@
},
"dist/common-map3d": {
"name": "@farmmaps/common-map3d",
"version": "4.12.0-prerelease.2532",
"version": "4.14.0-prerelease.2544",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": "^18.2.3",
"@angular/core": "^18.2.3",
"@angular/common": "18.2.3",
"@angular/core": "18.2.3",
"cesium": "^1.97.0",
"ol-cesium": ">=2.13.0"
}
},
"dist/ng-openlayers": {
"name": "@farmmaps/ng-openlayers",
"version": "4.12.0-prerelease.2532",
"version": "4.14.0-prerelease.2544",
"license": "MPL-2.0",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": "^18.2.3",
"@angular/core": "^18.2.3",
"@angular/common": "18.2.3",
"@angular/core": "18.2.3",
"ol": "^8.2.0"
}
},

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "farmmaps-lib-app",
"version": "4.12.1",
"version": "4.14.0",
"scripts": {
"ng": "ng",
"start": "ng serve",

1
projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
View File

@ -42,6 +42,7 @@
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
</ng-container>
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
<li><a href="#" (click)="download(item,$event)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
</ul>
</div>
</div>

16
projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
View File

@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core';
import { Location } from '@angular/common';
import { Store } from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common';
import { Router } from '@angular/router';
import { ForItemType } from '../for-item/for-itemtype.decorator';
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
@ -11,7 +11,6 @@ import * as mapActions from '../../actions/map.actions';
import { IItemLayer } from '../../models/item.layer';
import {TemporalService} from '../../services/temporal.service';
@ForItemType("vnd.farmmaps.itemtype.temporal")
@Injectable()
@Component({
@ -21,7 +20,7 @@ import {TemporalService} from '../../services/temporal.service';
})
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
super(store, itemTypeService,location,router);
}
@ -61,4 +60,15 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
return false;
}
download(item:IItem,event:MouseEvent) {
event.stopPropagation();
event.preventDefault();
const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10}
console.log('download1', itemLink)
const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {
console.log('download2', itemLinkUrl)
window.location.href =itemLinkUrl.url
})
}
}

20
projects/common/src/fm/actions/app-common.actions.ts
View File

@ -83,6 +83,11 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
export class InitUser implements Action {
readonly type = INITUSER;
@ -371,6 +376,17 @@ export class SetUnreadNotifications implements Action {
}
export class SwitchLanguage implements Action {
readonly type = SWITCHLANGUAGE;
constructor(public locale:string) { }
}
export class SetSettingMenuBackgroundColor implements Action {
readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
constructor(public color:string) { }
}
export type Actions = OpenModal
| InitRoot
@ -418,6 +434,8 @@ export type Actions = OpenModal
| ToggleHelpMenu
| ToggleSettingMenu
| NotificationEvent
| SetUnreadNotifications;
| SetUnreadNotifications
| SwitchLanguage
| SetSettingMenuBackgroundColor;

2
projects/common/src/fm/components/app/app.component.html
View File

@ -33,7 +33,7 @@
<fm-resumable-file-upload></fm-resumable-file-upload>
</ng-container>
<div class="user-menu apponly">
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>

1
projects/common/src/fm/components/app/app.component.ts
View File

@ -50,6 +50,7 @@ export class AppComponent implements OnInit, OnDestroy {
public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
@Input() showUploadProgress = true;
constructor(

2
projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
View File

@ -11,7 +11,7 @@
<i class="fal fa-image"></i>
<div i18n>No image selected</div>
</div>
<image-cropper #imageCropper
<image-cropper #imageCropper output="base64"
[imageChangedEvent]="imageChangedEvent"
[maintainAspectRatio]="true"
[format]="imageType"

2
projects/common/src/fm/components/setting-menu/setting-menu.component.html
View File

@ -1,5 +1,5 @@
<div>
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user || noContent}">
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
<span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
<router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>

1
projects/common/src/fm/components/setting-menu/setting-menu.component.ts
View File

@ -15,6 +15,7 @@ export class SettingMenuComponent implements OnInit {
@Input() user:IUser;
@Input() showMenu:boolean;
@Input() backgroundColor:string;
public noContent = true;
constructor(private store: Store<appReducers.State>) { }

28
projects/common/src/fm/effects/app-common.effects.ts
View File

@ -1,4 +1,4 @@
import { Injectable } from '@angular/core';
import { Injectable, Inject, LOCALE_ID } from '@angular/core';
import { Router } from '@angular/router';
import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
import { Store } from '@ngrx/store';
@ -16,6 +16,7 @@ import {StateSerializerService} from '../services/state-serializer.service';
@Injectable()
export class AppCommonEffects {
locale: string;
login$ = createEffect(() => this.actions$.pipe(
ofType(appCommonActions.LOGIN),
@ -47,11 +48,27 @@ export class AppCommonEffects {
first(),
switchMap((action) => {
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
switchMap(([user,userInfo]) => {
if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale)
{
return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
}
return of(new appCommonActions.SwitchLanguage(user.language))
}),
catchError(error => of(new appCommonActions.Fail(error))))
}
)));
switchLanguage$ = createEffect(() => this.actions$.pipe(
ofType(appCommonActions.SWITCHLANGUAGE),
switchMap((action) => {
const a = action as appCommonActions.SwitchLanguage;
if (location.href.includes(`/${this.locale}/`)) {
const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
location.replace(newPath);
}
return of(undefined);
})),{ dispatch:false});
initUserPackages$ = createEffect(() => this.actions$.pipe(
ofType(appCommonActions.INITUSERPACKAGES),
@ -208,7 +225,8 @@ export class AppCommonEffects {
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
this.locale = locale;
store$.dispatch(new appCommonActions.LoadItemTypes());
}
}
}

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

@ -29,7 +29,8 @@ export interface State {
settingMenuVisible: boolean,
unreadNotifications: number,
isOnline: boolean,
isPageMode:boolean
isPageMode:boolean,
settingMenuBackgroundColor:string
}
export const initialState: State = {
@ -51,7 +52,8 @@ export const initialState: State = {
settingMenuVisible: false,
unreadNotifications: 0,
isOnline: true,
isPageMode: true
isPageMode: true,
settingMenuBackgroundColor:'rgb(128, 128, 128)'
}
export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@ -187,6 +189,10 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
const a = action as appCommonActions.SetUnreadNotifications;
return tassign(state,{unreadNotifications:a.unread});
}
case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
const a = action as appCommonActions.SetSettingMenuBackgroundColor;
return tassign(state,{settingMenuBackgroundColor:a.color});
}
default: {
return state;
}
@ -212,6 +218,7 @@ export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
export const getUnreadNotifications = (state: State) => state.unreadNotifications;
export const getIsOnline = (state: State) => state.isOnline;
export const getIsPageMode = (state: State) => state.isPageMode;
export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
@ -238,5 +245,4 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,
export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);

12
projects/common/src/fm/services/admin.service.ts
View File

@ -52,4 +52,16 @@ export class AdminService {
postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
}
getAnalyseFolderOverview(): Observable<any> {
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`);
}
getAnalyseFolderInfo(user: string): Observable<any> {
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`);
}
getAnalyseFolderLog(): Observable<any> {
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`);
}
}