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

AW-6046 Fixes
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Peter (extern)
2024-04-15 14:03:35 +02:00
parent ea7e9584ab
commit 39c15d6519
8 changed files with 764 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/common-map/src/fm-map/common-map.module.ts
View File

@@ -9,7 +9,7 @@ import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
import { AngularOpenlayersModule } from 'ng-openlayers';
//common modules
import { AppCommonModule, ItemService, ItemTypeService, FolderService } from '@farmmaps/common';
import { AppCommonModule } from '@farmmaps/common';
import * as mapActions from './actions/map.actions';
import * as mapEffects from './effects/map.effects';
@@ -212,9 +212,6 @@ export {
GeolocationService,
DeviceOrientationService,
TemporalService,
ItemTypeService,
ItemService,
FolderService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },

4
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts
View File

@@ -23,7 +23,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
public items: Observable<IListItem[]>;
constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router, @Inject('itemService$') private itemService$: ItemService,@Inject('folderService$') private folderService$: FolderService) {
constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService, private folderService$: FolderService) {
super(store, itemTypeService,location,router);
}
@@ -42,7 +42,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
const atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
this.items = childItems.pipe(
combineLatest(atLocationItems),
switchMap(([ci,ali]) => {
switchMap(([ci, ali]) => {
const retVal:IListItem[] = [];
const codes = {};
ci.forEach((listItem) => {