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 
# Conflicts:
#	projects/common/src/fm/common-service.module.ts
This commit is contained in:
Willem Dantuma 2020-01-22 11:34:32 +01:00
commit 6389331c30
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
projects/common/src/fm/common.module.ts
View File

@ -1,15 +1,15 @@
// angular modules // angular modules
import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core'; import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common'; import { CommonModule, DatePipe } from '@angular/common';
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
// external modules // external modules
import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
import { StoreModule,Store } from '@ngrx/store'; import { StoreModule, Store } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import {UploadxModule } from 'ngx-uploadx'; import { UploadxModule } from 'ngx-uploadx';
// routing module // routing module
@ -19,8 +19,8 @@ import { MODULE_NAME } from './module-name';
//components //components
import { SafePipe } from './shared/safe.pipe'; import { SafePipe } from './shared/safe.pipe';
import { AuthConfigFactory,IAuthconfigFactory} from './shared/authconfigFactory'; import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
import { AppComponent} from './components/app/app.component'; import { AppComponent } from './components/app/app.component';
import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component'; import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component'; import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component'; import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
@ -29,15 +29,16 @@ import { NotImplementedComponent } from './components/not-implemented/not-implem
import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { SidePanelComponent } from './components/side-panel/side-panel.component';
import { TimespanComponent } from './components/timespan/timespan.component'; import { TimespanComponent } from './components/timespan/timespan.component';
import { TagInputComponent } from './components/tag-input/tag-input.component'; import { TagInputComponent } from './components/tag-input/tag-input.component';
import {MenuBackgroundComponent} from './components/menu-background/menu-background.component'; import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
import {IEventMessage } from './models/event.message'; import { IEventMessage } from './models/event.message';
import { IItem, Item } from './models/item'; import { IItem, Item } from './models/item';
import {IItemType} from './models/item.type'; import { IItemType } from './models/item.type';
import {IItemTypes} from './models/item.types'; import { IItemTypes } from './models/item.types';
import {IItemTask,ItemTask} from './models/itemTask'; import { IItemTask, ItemTask } from './models/itemTask';
import {IListItem} from './models/list.item'; import { IListItem } from './models/list.item';
import {ITypeaheadItem} from './models/typeahead.item'; import { ITypeaheadItem } from './models/typeahead.item';
import {IUser} from './models/user'; import { IUser } from './models/user';
import { ICodeListItem } from './models/code.list.item';
import * as commonActions from './actions/app-common.actions'; import * as commonActions from './actions/app-common.actions';
import * as commonReducers from './reducers/app-common.reducer'; import * as commonReducers from './reducers/app-common.reducer';
import * as commonEffects from './effects/app-common.effects'; import * as commonEffects from './effects/app-common.effects';
@ -64,6 +65,7 @@ export {
IListItem, IListItem,
ITypeaheadItem, ITypeaheadItem,
IUser, IUser,
ICodeListItem,
commonActions, commonActions,
commonReducers, commonReducers,
IAuthconfigFactory, IAuthconfigFactory,
@ -77,7 +79,7 @@ export {
CommonModule, CommonModule,
HttpClientModule, HttpClientModule,
AppCommonRoutingModule, AppCommonRoutingModule,
StoreModule.forFeature(MODULE_NAME, commonReducers.reducer ), StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
EffectsModule.forFeature([commonEffects.AppCommonEffects]), EffectsModule.forFeature([commonEffects.AppCommonEffects]),
OAuthModule.forRoot(), OAuthModule.forRoot(),
NgbModule, NgbModule,

5
projects/common/src/fm/services/codelistitem.service.ts
View File

@ -15,12 +15,11 @@ export class CodeListItemService {
return this.appConfig.getConfig("apiEndPoint"); return this.appConfig.getConfig("apiEndPoint");
} }
getCodeListItems(codelist: string[], codegroup?: string, dataFilter?: any, onlyBetweenValidFromAndTo: boolean = true): Observable<ICodeListItem[]> { getCodeListItems(codelist: string[], codegroup?: string, dataFilter?: any): Observable<ICodeListItem[]> {
var params = new HttpParams(); var params = new HttpParams();
params = params.append("cl", codelist.join(",")); params = params.append("cl", codelist.join(","));
if (codegroup) params = params.append("g", codegroup); if (codegroup) params = params.append("g", codegroup);
if (onlyBetweenValidFromAndTo) params = params.append("v", onlyBetweenValidFromAndTo);
if (dataFilter) params = params.append("df", dataFilter); if (dataFilter) params = params.append("df", dataFilter);
return this.httpClient.get<ICodeListItem>(`${this.ApiEndpoint()}/api/v1/codelistitems/`, { params: params }); return this.httpClient.get<ICodeListItem[]>(`${this.ApiEndpoint()}/api/v1/codelistitems/`, { params: params });
} }
} }