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

Aw5812

Browse Source
This commit is contained in:
Peter Bastiani 2024-02-01 15:21:04 +01:00
parent 92b29135b5
commit 4641e351fd
9 changed files with 98 additions and 3322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3371
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -57,7 +57,7 @@
"zone.js": "~0.13.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^15",
"@angular-builders/custom-webpack": "^16",
"@angular-devkit/build-angular": "^16.2.11",
"@angular/cli": "^16.2.11",
"@angular/compiler-cli": "^16.2.12",

10
projects/common-map/src/fm-map/actions/map.actions.ts
View File

@ -58,7 +58,7 @@ export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
export const SETVIEWSTATE = '[Map] SetViewState'
export const CLEARFEATURES = '[Map] ClearFeatures';
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
export class Clear implements Action {
readonly type = CLEAR;
@ -342,6 +342,11 @@ export class ClearFeatures implements Action {
constructor() {}
}
export class SetPanelExtraWide implements Action {
readonly type = SETPANELEXTRAWIDE;
constructor(public panelExtraWide:boolean) {}
}
export type Actions = SetMapState
| Init
| Clear
@ -389,5 +394,6 @@ export type Actions = SetMapState
| SetPeriod
| ToggleShowDataLayerSlide
| SetViewState
| ClearFeatures;
| ClearFeatures
| SetPanelExtraWide;

3
projects/common-map/src/fm-map/components/map/map.component.html
View File

@ -10,6 +10,7 @@
panelVisible:panelVisible$|async,
openedModalName:openedModalName$|async,
panelCollapsed:panelCollapsed$|async,
panelExtraWide:panelExtraWide$|async,
searchMinified:searchMinified$|async,
selectedItem:selectedItem$|async,
parentItem:parentItem$|async,
@ -64,7 +65,7 @@
</div>
<div class="side-panel-container">
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
<div class="panel-wrapper" *ngIf="noContent">
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
</div>

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

@ -66,6 +66,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
public panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
@ -208,7 +209,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
if(component && component.hasOwnProperty('clickedFeature')) {
(component as IClickedFeature).clickedFeature = this.clickedFeature;
}
if(component && component.hasOwnProperty('extraWide')) {
this.store.dispatch(new mapActions.SetPanelExtraWide(true));
}
}
handleSidepaneloutletDeactivate(component:any) {
if(component && component.hasOwnProperty('clickedFeature')) {

8
projects/common-map/src/fm-map/reducers/map.reducer.ts
View File

@ -49,6 +49,7 @@ export interface State {
features: Array<Feature<Geometry>>,
panelVisible: boolean,
panelCollapsed: boolean,
panelExtraWide: boolean,
selectedFeature: Feature<Geometry>,
selectedItem:IItem,
parentItem:IItem,
@ -94,6 +95,7 @@ export const initialState: State = {
features: [],
panelVisible: false,
panelCollapsed: false,
panelExtraWide: false,
selectedFeature: null,
selectedItem: null,
parentItem: null,
@ -572,6 +574,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
}
return state;
}
case mapActions.SETPANELEXTRAWIDE:{
const a= action as mapActions.SetPanelExtraWide;
return tassign(state,{panelExtraWide:a.panelExtraWide});
}
default: {
return state;
}
@ -583,6 +589,7 @@ export const getParentCode = (state: State) => state.parentCode;
export const getFeatures = (state: State) => state.features;
export const getPanelVisible = (state: State) => state.panelVisible;
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
export const getPanelExtraWide = (state: State) => state.panelExtraWide;
export const getSelectedFeature = (state: State) => state.selectedFeature;
export const getSelectedItem = (state: State) => state.selectedItem;
export const getParentItem = (state: State) => state.parentItem;
@ -618,6 +625,7 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
export const selectGetParentItem = createSelector(selectMapState, getParentItem);

2
projects/common/src/fm/components/side-panel/side-panel.component.html
View File

@ -1,4 +1,4 @@
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [ngStyle]="{'top':top}">
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left,'extrawide':extraWide}" [ngStyle]="{'top':top}">
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
<i class="fal fa-chevron-left" aria-hidden="true"></i>
</div>

14
projects/common/src/fm/components/side-panel/side-panel.component.scss
View File

@ -15,7 +15,7 @@
}
.side-panel.collapsed {
left:-22rem;
left:-44rem;
}
.arrow {
@ -75,8 +75,7 @@ div.resizegrip > span {
}
.resizeable .resizegrip {
display:block;
display:block;
}
.resizeable .content {
@ -94,9 +93,16 @@ div.resizegrip > span {
.side-panel.hidden {
width: 22rem;
left:-24rem;
left:-22rem;
height:100%;
top: 0px;
}
.side-panel.extra-wide {
top:0px;
width: 44rem;
height:100%;
left:0px;
}
}

6
projects/common/src/fm/components/side-panel/side-panel.component.ts
View File

@ -3,8 +3,7 @@ import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,Si
@Component({
selector: 'fm-side-panel',
templateUrl: 'side-panel.component.html',
styleUrls: ['side-panel.component.scss'],
encapsulation: ViewEncapsulation.None
styleUrls: ['side-panel.component.scss']
})
@ -13,7 +12,8 @@ export class SidePanelComponent implements OnChanges {
@Input() public collapsed: boolean;
@Input() public collapsable: boolean;
@Input() public resizeable = false;
@Input() public left = false;
@Input() public left = false;
@Input() public extraWide = false;
@Output() onResize: EventEmitter<number> = new EventEmitter<number>();
@ViewChild("resizeGrip") elementView: ElementRef;
public mobile = true;