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

Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2020-01-27 17:01:39 +01:00
commit 252e920848
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.npmrc Normal file
View File

@ -0,0 +1 @@
@FarmMaps:registry=https://repository.akkerweb.nl/repository/npm-group/

2
projects/common-map/src/fm-map/components/item-list/item-list.component.scss
View File

@ -19,7 +19,7 @@
.widget:after { .widget:after {
content: ""; content: "";
display: block; display: block;
padding-bottom: 100%; padding-bottom: 66%;
} }
.content { .content {

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

@ -1,11 +1,10 @@
import { Component, Input, Injectable } from '@angular/core'; import {Component, Injectable, Input} from '@angular/core';
import { Location } from '@angular/common'; import {Location} from '@angular/common';
import { Feature } from 'ol'; import {Store} from '@ngrx/store';
import { Store } from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer'; import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers,ItemTypeService, IItem, Item,AppConfig } from '@farmmaps/common'; import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
import * as mapActions from '../../actions/map.actions'; import * as mapActions from '../../actions/map.actions';
import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router'; import {Router} from '@angular/router';
@Injectable() @Injectable()
@ -23,13 +22,13 @@ export abstract class AbstractSelectedItemComponent {
return false; return false;
} }
handleOnEdit(item: IItem) { handleOnEdit(item: IItem) {
var editor = "property"; var editor = "property";
if(this.itemTypeService.hasEditor(item)) { if(this.itemTypeService.hasEditor(item)) {
editor = this.itemTypeService.itemTypes[item.itemType].editor; editor = this.itemTypeService.itemTypes[item.itemType].editor;
} }
let url = `/editor/${editor}/item/${item.code}` let url = `/editor/${editor}/item/${item.code}`
this.router.navigate([url]); this.router.navigate([url]);
return false; return false;
} }